diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-25 00:26:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-25 00:26:09 +0000 |
| commit | bc0428eb087feaf853c37e5a1c9b94144dc2b0a8 (patch) | |
| tree | 1d92573b2ce201ee1b0d26af9daba27b0dcf91b1 | |
| parent | bbdcaffd33d488a13e23b405afd4d5929034ce91 (diff) | |
| parent | c354d56eea3ac6139916bb8c21fa1b4ef580d598 (diff) | |
| download | apf-bc0428eb087feaf853c37e5a1c9b94144dc2b0a8.tar.gz | |
Merge "Add data_bins to apf_run_test so it can run remotely." am: bdd03091c3 am: c354d56eea
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/1407987
Change-Id: I9049840c9ea3686fe68bd4eb86ebaa712eadcc4e
| -rw-r--r-- | Android.bp | 2 | ||||
| -rwxr-xr-x | apf_run_test.sh | 2 | ||||
| -rw-r--r-- | apf_run_test.xml | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -59,8 +59,8 @@ sh_test_host { filename: "apf_run_test.sh", test_suites: ["general-tests"], test_config: "apf_run_test.xml", - required: ["apf_run"], data: ["testdata/*"], + data_bins: ["apf_run"], target: { darwin: { enabled: false, diff --git a/apf_run_test.sh b/apf_run_test.sh index 12bbfe0..ef47fc8 100755 --- a/apf_run_test.sh +++ b/apf_run_test.sh @@ -23,7 +23,7 @@ for prog in testdata/*.program; do args="$args --age $(cat testdata/$testcase.age)" fi - if diff --color -u <(apf_run $args) <(cat $outputpath); then + if diff --color -u <(./apf_run $args) <(cat $outputpath); then echo $testname: $testcase: PASS else echo $testname: $testcase: FAIL diff --git a/apf_run_test.xml b/apf_run_test.xml index 689d5a6..1719348 100644 --- a/apf_run_test.xml +++ b/apf_run_test.xml @@ -15,7 +15,7 @@ --> <configuration description="Config for running APF tools tests through atest"> <option name="test-suite-tag" value="apf_run_test" /> - <!-- This test requires a device, so it's not annotated with a null-device --> + <option name="null-device" value="true" /> <test class="com.android.tradefed.testtype.binary.ExecutableHostTest" > <option name="binary" value="apf_run_test.sh" /> <!-- Script assumes a relative path with the tests/ folders --> |