From 118cec97c2ed8ab4f85941ce872ad569023294b5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 12 Dec 2020 18:39:05 -0500 Subject: [PATCH] moving start-up script from java to bash --- java_console/autotest/src/com/rusefi/RealHwTest.java | 11 ++++++++--- .../functional_test_and_build_bundle/hw_test.sh | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java_console/autotest/src/com/rusefi/RealHwTest.java b/java_console/autotest/src/com/rusefi/RealHwTest.java index 8a2e6c665f..4c9cc18062 100644 --- a/java_console/autotest/src/com/rusefi/RealHwTest.java +++ b/java_console/autotest/src/com/rusefi/RealHwTest.java @@ -22,11 +22,16 @@ import static com.rusefi.Timeouts.SECOND; */ public class RealHwTest { private static final Logging log = getLogging(RealHwTest.class); - private static final int STARTUP_SLEEP = 20; + public static final String HW_TESTS_START_UP_SLEEP = "hw_tests_start_up_sleep"; + private static final int STARTUP_SLEEP = Integer.getInteger(HW_TESTS_START_UP_SLEEP, 0); public static void main(String[] args) throws InterruptedException { - log.info("Sleeping " + STARTUP_SLEEP + " seconds to give OS time to connect VCP driver"); - Thread.sleep(STARTUP_SLEEP * SECOND); + if (STARTUP_SLEEP != 0) { + log.info("Sleeping " + STARTUP_SLEEP + " seconds to give OS time to connect VCP driver"); + Thread.sleep(STARTUP_SLEEP * SECOND); + } else { + log.info(HW_TESTS_START_UP_SLEEP + " VM option not specified, no start-up sleep in java code"); + } boolean isSuccess = runHardwareTest(args); if (!isSuccess) diff --git a/misc/jenkins/functional_test_and_build_bundle/hw_test.sh b/misc/jenkins/functional_test_and_build_bundle/hw_test.sh index e846efb520..a6e1237b5b 100644 --- a/misc/jenkins/functional_test_and_build_bundle/hw_test.sh +++ b/misc/jenkins/functional_test_and_build_bundle/hw_test.sh @@ -28,6 +28,8 @@ cd java_console echo "Running tests" which java which javac +echo Sleeping few seconds to give OS time to connect VCP driver +sleep 20s ant real_hardware_functional_test [ $? -eq 0 ] || { echo "ERROR DETECTED"; exit 1; }