Index: build/android/buildbot_functions.sh |
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh |
index c830e588fd738420fe610233850486d6b2522308..abbfd8a2fe1a873921a4f7ebede44fd5d4c5e0e2 100755 |
--- a/build/android/buildbot_functions.sh |
+++ b/build/android/buildbot_functions.sh |
@@ -189,6 +189,30 @@ function bb_compile { |
bb_goma_make |
} |
+# Re-gyp and compile with unit test bundles configured as shlibs for |
+# the native test runner. Experimental for now. Once the native test |
+# loader is on by default, this entire function becomes obsolete. |
+function bb_native_test_compile_run_tests { |
+ echo "@@@BUILD_STEP Re-gyp for the native test runner@@@" |
+ GYP_DEFINES="$GYP_DEFINES gtest_target_type=shared_library" android_gyp |
+ |
+ echo "@@@BUILD_STEP Native test runner compile@@@" |
+ bb_goma_make |
+ |
+ # Make sure running the template prints an expected failure. |
+ echo "@@@BUILD_STEP Native test runner template test@@@" |
+ tempfile=/tmp/tempfile-$$.txt |
+ build/android/run_tests.py --xvfb --verbose \ |
+ -s out/Release/replaceme_apk/ChromeNativeTests-debug.apk \ |
Yaron
2012/04/12 01:29:53
replaceme_apk? I dont' see where this instance of
John Grabowski
2012/04/13 01:11:37
It isn't. This test is for compiling the template
|
+ | sed 's/@@@STEP_FAILURE@@@//g' | tee $tempfile |
+ happy_failure=$(cat $tempfile | grep NATIVE_LOADER_FAILED | wc -l) |
Yaron
2012/04/12 01:29:53
is a failure really ever happy?
bulach
2012/04/12 15:51:42
nit: a grep -c makes wc unecessary... but honestly
John Grabowski
2012/04/13 01:11:37
Yes. If compiling the template yells about "no sh
John Grabowski
2012/04/13 01:11:37
Not sure I agree. We are building the template.
bulach
2012/04/13 09:42:51
well, even if it's temporary, I'd rather have the
|
+ if [[ $happy_failure -eq 0 ]] ; then |
+ echo "@@@STEP_FAILURE@@@" |
+ else |
+ echo "The previous NATIVE_LOADER_FAILED implies success for the runner." |
+ fi |
+} |
+ |
# Experimental compile step; does not turn the tree red if it fails. |
function bb_compile_experimental { |
# Linking DumpRenderTree appears to hang forever? |