Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2238ad2 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Move smoke-excluded-tests.txt to texts/" 

This reverts commit e5b64290.

Reason for revert: Droidmonitor created revert due to b/438065790. Will be verifying through ABTD before submission.

Fix: 438065790
Bug: 292141694
Change-Id: I9e45a62cddd743fbf23f0db062334e49e7978c47
parent e5b64290

ravenwood/TEST_MAPPING

+6 −9
Original line number Original line Diff line number Diff line 
{

{

  "presubmit": [

  "presubmit": [

    // Non-ravenwood host side tests.

    { "name": "tiny-framework-dump-test" },

    { "name": "tiny-framework-dump-test", "host": true },

    { "name": "hoststubgentest" },

    { "name": "hoststubgentest", "host": true },

    { "name": "ravenhelpertest" },

    { "name": "ravenhelpertest", "host": true },

    { "name": "hoststubgen-test-tiny-test" },

    { "name": "hoststubgen-test-tiny-test", "host": true },

    { "name": "hoststubgen-invoke-test" },

    { "name": "hoststubgen-invoke-test", "host": true },

    { "name": "ravenwood-scripts-sh-golden-test" },

    { "name": "ravenwood-scripts-sh-golden-test", "host": true },



    // Device side tests for the bivalent tests.

    { "name": "RavenwoodMockitoTest_device" },

    { "name": "RavenwoodMockitoTest_device" },

    { "name": "RavenwoodBivalentTest_device" },

    { "name": "RavenwoodBivalentTest_device" },

    { "name": "RavenwoodBivalentTest_device_ravenizer" },

    { "name": "RavenwoodBivalentTest_device_ravenizer" },

ravenwood/scripts/run-ravenwood-tests.sh

+2 −13
Original line number Original line Diff line number Diff line
@@ -113,17 +113,12 @@ all_tests+=( "${all_raven_tests[@]}" ) 
: ${ROLLING_TF_SUBPROCESS_OUTPUT:=0}

: ${ROLLING_TF_SUBPROCESS_OUTPUT:=0}

export ROLLING_TF_SUBPROCESS_OUTPUT

export ROLLING_TF_SUBPROCESS_OUTPUT





# Cat all the files in the argument with all the "#" comments removed.

remove_comments() {

    sed -e '/^#/d; s/[ \t][ \t]*//g; /^$/d' "$@"

}



get_smoke_re() {

get_smoke_re() {

    # Extract tests from smoke-excluded-tests.txt

    # Extract tests from smoke-excluded-tests.txt

    # - Skip lines starting with #

    # - Skip lines starting with #

    # - Remove all spaces and tabs

    # - Remove all spaces and tabs

    # - Skip empty lines

    # - Skip empty lines

    local tests=($(remove_comments ../texts/smoke-excluded-tests.txt))

    local tests=($(sed -e '/^#/d; s/[ \t][ \t]*//g; /^$/d' smoke-excluded-tests.txt))





    # Then convert it to a regex.

    # Then convert it to a regex.

    # - Wrap in "^( ... )$"

    # - Wrap in "^( ... )$"
@@ -191,13 +186,7 @@ if [[ "$RAVENWOOD_TEST_ENABLEMENT_POLICY" == "" ]] && (( "${#default_enablement_ 
    # This path must be a full path.

    # This path must be a full path.

    combined_enablement_policy=/tmp/ravenwood-enablement-@@@$$@@@.txt

    combined_enablement_policy=/tmp/ravenwood-enablement-@@@$$@@@.txt





    # Join all the enablement policy files, but we add a newline

    cat "${default_enablement_policy[@]}" >$combined_enablement_policy

    # after each file. (so that it wouldn't break if any of the files

    # don't end with a newline.)

    for file in "${default_enablement_policy[@]}"; do

        cat "$file"

        echo

    done >$combined_enablement_policy





    export RAVENWOOD_TEST_ENABLEMENT_POLICY=$combined_enablement_policy

    export RAVENWOOD_TEST_ENABLEMENT_POLICY=$combined_enablement_policy

fi

fi

ravenwood/scripts/tests/ravenwood-scripts-sh-golden-test.sh

+2 −12
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ esac 
done

done

shift $(($OPTIND - 1))

shift $(($OPTIND - 1))







# Find the script directory:

# Find the script directory:

# - `../` when running directly.

# - `../` when running directly.

# - './scripts/` when running with atest.

# - './scripts/` when running with atest.
@@ -41,20 +42,9 @@ if [[ -e ./scripts/run-ravenwood-tests.sh ]] ; then 
    script_dir=./scripts/

    script_dir=./scripts/

fi

fi





target_script="$script_dir/run-ravenwood-tests.sh"



echo "# Installed files:"

echo

ls -lRa .

echo



echo "# Target script:"

echo "$target_script"

echo



# Command to run "run-ravenwood-tests.sh"

# Command to run "run-ravenwood-tests.sh"

run-ravenwood-tests-wrapper() {

run-ravenwood-tests-wrapper() {

    "$target_script" -d "$@"

    $script_dir/run-ravenwood-tests.sh -d "$@"

}

}





# We "inject" into list-ravenwood-tests.sh and use them as the test module names.

# We "inject" into list-ravenwood-tests.sh and use them as the test module names.