diff options
author | Karl Shaffer <karlshaffer@google.com> | 2021-05-12 18:22:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 18:22:55 +0000 |
commit | 668fb2821d6d3e61071f6277880c9b8721a561c5 (patch) | |
tree | 8649d023cca68532982dcb0cc432054efeca6c7e | |
parent | ae23ee0c9169f92f9e81bd0a7a856adde07fc2e3 (diff) | |
parent | 474daf1a3fccaf7d1f5662230ab8fa6c77a9fa19 (diff) | |
download | pesto-668fb2821d6d3e61071f6277880c9b8721a561c5.tar.gz |
Enables --host flag for Local TF runs am: 2d913d2e4e am: 222a422635 am: 8df5d87e64 am: 0f35caa819 am: 474daf1a3f
Original change: https://android-review.googlesource.com/c/platform/build/pesto/+/1690145
Change-Id: I24000cccf07a4326d560bb8c30578afc82f1a05c
2 files changed, 18 insertions, 9 deletions
diff --git a/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh b/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh index ffe2850..2dc64ca 100644 --- a/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh +++ b/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh @@ -17,6 +17,11 @@ shift TEST_PATH=$1 shift +if [ $1 != "" ] && [ $1 == "--host" ]; then + HOST_ARGS=(-n --prioritize-host-config --skip-host-arch-check) + shift +fi + exec $TRADEFED_LAUNCHER template/atest_local_min \ --template:map test=atest \ --tests-dir "$TEST_PATH" \ @@ -27,7 +32,5 @@ exec $TRADEFED_LAUNCHER template/atest_local_min \ --skip-loading-config-jar \ --log-level-display VERBOSE \ --log-level VERBOSE \ - -n \ - --prioritize-host-config \ - --skip-host-arch-check \ + "${HOST_ARGS[@]}" \ "$@"
\ No newline at end of file diff --git a/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template b/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template index 4c7e3e0..6d4a026 100644 --- a/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template +++ b/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template @@ -25,18 +25,24 @@ _LIB_SRCS = glob([ "{prebuilts_dir_name}/host/lib/**/*", "{prebuilts_dir_name}/host/lib64/**/*" ]) -_TESTCASE_SRCS = glob( +_TESTCASE_HOST_SRCS = glob( ["{prebuilts_dir_name}/host/testcases/hello_world_test/**/*"]) +_TESTCASE_DEVICE_SRCS = glob(["{prebuilts_dir_name}/target_testcases/hello_world_test/**/*"]) _LIB_OUTS = [f.replace("{prebuilts_dir_name}/host/", "") for f in _LIB_SRCS] -_TESTCASE_OUTS = [ - f.replace("{prebuilts_dir_name}/host/testcases/hello_world_test/", "") - for f in _TESTCASE_SRCS +_TESTCASE_HOST_OUTS = [ + f.replace("{prebuilts_dir_name}/host/testcases/hello_world_test/", "host/") + for f in _TESTCASE_HOST_SRCS ] +_TESTCASE_DEVICE_OUTS = [ + f.replace("{prebuilts_dir_name}/target_testcases/hello_world_test/", "device/") + for f in _TESTCASE_DEVICE_SRCS +] + genrule(name="hello_world_test_prebuilt", - srcs=_LIB_SRCS + _TESTCASE_SRCS, - outs=_LIB_OUTS + _TESTCASE_OUTS, + srcs=_LIB_SRCS + _TESTCASE_HOST_SRCS + _TESTCASE_DEVICE_SRCS, + outs=_LIB_OUTS + _TESTCASE_HOST_OUTS + _TESTCASE_DEVICE_OUTS, cmd=""" src_files=($(SRCS)) out_files=($(OUTS)) |