rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

returning simlator test into CI

This commit is contained in:
rusefi 2019-02-28 18:38:27 -05:00
parent d1da63ecac
commit 5432ac0849
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java_console/autotest/src/com/rusefi/AutoTest.java
View File

@ -472,6 +472,7 @@ public class AutoTest {
System.exit(-1); System.exit(-1);
} }
}); });
boolean startSimulator = args.length == 1 && args[0].equalsIgnoreCase("start");
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
FileLog.SIMULATOR_CONSOLE.start(); FileLog.SIMULATOR_CONSOLE.start();
@ -479,7 +480,7 @@ public class AutoTest {
boolean failed = false; boolean failed = false;
try { try {
IoUtil.launchSimulator(false); IoUtil.connectToSimulator(startSimulator);
mainTestBody(); mainTestBody();
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();

2
java_console/autotest/src/com/rusefi/IoUtil.java
View File

@ -105,7 +105,7 @@ public class IoUtil {
FileLog.MAIN.logLine("Got first signal in " + (System.currentTimeMillis() - waitStart)); FileLog.MAIN.logLine("Got first signal in " + (System.currentTimeMillis() - waitStart));
} }
static void launchSimulator(boolean startProcess) throws InterruptedException { static void connectToSimulator(boolean startProcess) throws InterruptedException {
if (startProcess) { if (startProcess) {
if (!TcpConnector.getAvailablePorts().isEmpty()) if (!TcpConnector.getAvailablePorts().isEmpty())
throw new IllegalStateException("Port already binded on startup?"); throw new IllegalStateException("Port already binded on startup?");

2
java_console/build.xml
View File

@ -88,7 +88,7 @@
<java jar="${jar_file}" fork="true"/> <java jar="${jar_file}" fork="true"/>
</target> </target>
<target name="autotest" depends="jar"> <target name="simlator_test" depends="jar">
<java classpath="${jar_file}" classname="com.rusefi.AutoTest" failonerror="true"> <java classpath="${jar_file}" classname="com.rusefi.AutoTest" failonerror="true">
</java> </java>

15
misc/jenkins/functional_test_and_build_bundle/simulator_test.bat Normal file
View File

@ -0,0 +1,15 @@
echo I am simulator_test.bat
pwd
cd java_console
echo Running simulator functional test
which java
which javac
ant simlator_test
IF NOT ERRORLEVEL echo ERROR DETECTED
IF NOT ERRORLEVEL 0 EXIT /B 1
echo %date% %time%
echo simulator_test.bat: done