Revert "Disable running run-test with linux_bionic"
The build_linux_bionic_tests.sh script was using incorrect environment
variables causing it to fail to build all required libraries when run
on the bots.
Reason for revert: Fixed issue with running linux_bionic run-tests on
the bots.
This reverts commit 1d77a70bc0e1138dbd4a57375f34854bcdb26780.
Test: cd <android-root>; # don't do envsetup or lunch
./art/test/testrunner/run_build_test_target.py -j80 art-linux-bionic-x64
Bug: 119673278
Bug: 119687007
Change-Id: I6f484d0d2e2accbfab6bd90c510915d5e2eeb64d
diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py
index b187813..077129f 100644
--- a/test/testrunner/target_config.py
+++ b/test/testrunner/target_config.py
@@ -331,10 +331,9 @@
},
'art-linux-bionic-x64': {
'build': '{ANDROID_BUILD_TOP}/art/tools/build_linux_bionic_tests.sh {MAKE_OPTIONS}',
- # Currently failing on the build-bots due to some library search path issue.
- # 'run-test': ['--run-test-option=--bionic',
- # '--host',
- # '--64',
- # '--no-build-dependencies'],
+ 'run-test': ['--run-test-option=--bionic',
+ '--host',
+ '--64',
+ '--no-build-dependencies'],
},
}
diff --git a/tools/build_linux_bionic_tests.sh b/tools/build_linux_bionic_tests.sh
index 3ee7d50..2b178f2 100755
--- a/tools/build_linux_bionic_tests.sh
+++ b/tools/build_linux_bionic_tests.sh
@@ -29,6 +29,7 @@
source build/envsetup.sh >&/dev/null # for get_build_var
out_dir=$(get_build_var OUT_DIR)
+host_out=$(get_build_var HOST_OUT)
# TODO(b/31559095) Figure out a better way to do this.
#
@@ -80,8 +81,8 @@
$soong_out/bin/hiddenapi
$soong_out/bin/hprof-conv
$soong_out/bin/timeout_dumper
- $(find $ANDROID_HOST_OUT/lib64 -type f | sed "s:$ANDROID_HOST_OUT:$soong_out:g")
- $(find $ANDROID_HOST_OUT/nativetest64 -type f | sed "s:$ANDROID_HOST_OUT:$soong_out:g"))
+ $(find $host_out/lib64 -type f | sed "s:$host_out:$soong_out:g")
+ $(find $host_out/nativetest64 -type f | sed "s:$host_out:$soong_out:g"))
echo building ${bionic_targets[*]}