diff --git a/.travis.yml b/.travis.yml index cc7c35228a..c81c9ec9d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,8 @@ matrix: - env: - JOBNAME="Linux/ARM Build & Correctness Tests" - OPTS="--quiet --jerry-tests --jerry-test-suite --toolchain=cmake/toolchain_linux_armv7l.cmake" + - RUNTIME=qemu-arm-static - TIMEOUT=300 - sudo: true # keep on sudo-enabled VM to allow qemu to register itself to binfmt_misc addons: apt: packages: [gcc-arm-linux-gnueabihf, libc6-dev-armhf-cross, qemu-user-static] diff --git a/tools/runners/run-test-suite-test262.sh b/tools/runners/run-test-suite-test262.sh index 7a990f0584..680309d242 100755 --- a/tools/runners/run-test-suite-test262.sh +++ b/tools/runners/run-test-suite-test262.sh @@ -24,6 +24,12 @@ if [ $? -ne 0 ] then TIMEOUT_CMD=`which gtimeout` fi +if [ -z "${RUNTIME}" ] +then + COMMAND="${TIMEOUT_CMD} ${TIMEOUT} ${ENGINE}" +else + COMMAND="${TIMEOUT_CMD} ${TIMEOUT} ${RUNTIME} ${ENGINE}" +fi if [ $# -lt 2 ] then @@ -56,7 +62,7 @@ rm -f "${PATH_TO_TEST262}/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js" echo "Starting test262 testing for ${ENGINE}. Running test262 may take a several minutes." -python2 "${PATH_TO_TEST262}"/tools/packaging/test262.py --command "${TIMEOUT_CMD} ${TIMEOUT} ${ENGINE}" \ +python2 "${PATH_TO_TEST262}"/tools/packaging/test262.py --command "${COMMAND}" \ --tests="${PATH_TO_TEST262}" --summary \ &> "${REPORT_PATH}" TEST262_EXIT_CODE=$? diff --git a/tools/runners/run-test-suite.sh b/tools/runners/run-test-suite.sh index d10e8fc020..1dbd644c38 100755 --- a/tools/runners/run-test-suite.sh +++ b/tools/runners/run-test-suite.sh @@ -148,23 +148,23 @@ do # Testing snapshot SNAPSHOT_TEMP=`mktemp $(basename -s .js $test).snapshot.XXXXXXXXXX` - cmd_line="${SNAPSHOT_TOOL#$ROOT_DIR} generate -o $SNAPSHOT_TEMP ${full_test#$ROOT_DIR}" - $TIMEOUT_CMD $TIMEOUT $SNAPSHOT_TOOL generate -o $SNAPSHOT_TEMP $full_test &> $ENGINE_TEMP + cmd_line="$RUNTIME ${SNAPSHOT_TOOL#$ROOT_DIR} generate -o $SNAPSHOT_TEMP ${full_test#$ROOT_DIR}" + $TIMEOUT_CMD $TIMEOUT $RUNTIME $SNAPSHOT_TOOL generate -o $SNAPSHOT_TEMP $full_test &> $ENGINE_TEMP status_code=$? if [ $status_code -eq 0 ] then test $VERBOSE && echo "[$tested/$TOTAL] $cmd_line: PASS" - cmd_line="${ENGINE#$ROOT_DIR} $ENGINE_ARGS --exec-snapshot $SNAPSHOT_TEMP" - $TIMEOUT_CMD $TIMEOUT $ENGINE $ENGINE_ARGS --exec-snapshot $SNAPSHOT_TEMP &> $ENGINE_TEMP + cmd_line="$RUNTIME ${ENGINE#$ROOT_DIR} $ENGINE_ARGS --exec-snapshot $SNAPSHOT_TEMP" + $TIMEOUT_CMD $TIMEOUT $RUNTIME $ENGINE $ENGINE_ARGS --exec-snapshot $SNAPSHOT_TEMP &> $ENGINE_TEMP status_code=$? fi rm -f $SNAPSHOT_TEMP else - cmd_line="${ENGINE#$ROOT_DIR} $ENGINE_ARGS ${full_test#$ROOT_DIR}" - $TIMEOUT_CMD $TIMEOUT $ENGINE $ENGINE_ARGS $full_test &> $ENGINE_TEMP + cmd_line="$RUNTIME ${ENGINE#$ROOT_DIR} $ENGINE_ARGS ${full_test#$ROOT_DIR}" + $TIMEOUT_CMD $TIMEOUT $RUNTIME $ENGINE $ENGINE_ARGS $full_test &> $ENGINE_TEMP status_code=$? fi diff --git a/tools/runners/run-unittests.sh b/tools/runners/run-unittests.sh index 78e94372d3..837ce12be9 100755 --- a/tools/runners/run-unittests.sh +++ b/tools/runners/run-unittests.sh @@ -65,8 +65,8 @@ UNITTEST_TEMP=`mktemp unittest-out.XXXXXXXXXX` for unit_test in $UNITTESTS do - cmd_line="${unit_test#$ROOT_DIR}" - $unit_test &>$UNITTEST_TEMP + cmd_line="$RUNTIME ${unit_test#$ROOT_DIR}" + $RUNTIME $unit_test &>$UNITTEST_TEMP status_code=$? if [ $status_code -ne 0 ]