commit d295a75d952742604eaae0530daea19dd6fd782c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 19 17:37:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 19 17:37:07 2018 +0000
tree 4b1b160288ddeedd26dbd7658847c1bcdd20d9b2
parent d762ec7ee95fda8b0eeb0b0503df9da392ca0dbc
parent cbc64c8aa56b93eb87283fea83f871db445fbf60

Merge "Revert "Disable running run-test with linux_bionic""

test/testrunner/target_config.py

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'],
     },
 }

tools/build_linux_bionic_tests.sh

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[*]}