Merge push-and-run-{prebuilt}-test-jar files.
Can't find a reason why those two files forked...
Change-Id: I5ef3dd76aa3b2d843c8b4b57365edec3bf2c3f3b
diff --git a/test/run-test b/test/run-test
index b140fbf..4f1cbab 100755
--- a/test/run-test
+++ b/test/run-test
@@ -118,9 +118,11 @@
relocate="no"
shift
elif [ "x$1" = "x--prebuild" ]; then
+ run_args="${run_args} --prebuild"
prebuild_mode="yes"
shift;
elif [ "x$1" = "x--no-prebuild" ]; then
+ run_args="${run_args} --no-prebuild"
prebuild_mode="no"
shift;
elif [ "x$1" = "x--gcverify" ]; then
@@ -263,13 +265,6 @@
fi
else
RUN="${progdir}/etc/host-run-test-jar"
- if [ "$prebuild_mode" = "yes" ]; then
- run_args="${run_args} --prebuild"
- fi
- fi
-else
- if [ "$prebuild_mode" = "yes" ]; then
- RUN="${progdir}/etc/push-and-run-prebuilt-test-jar"
fi
fi