FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusefi 2019-02-28 19:42:41 -05:00
parent 1d9720e5e5 04183ad039
commit d06337e2f5
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java_console/autotest/src/com/rusefi/ExecHelper.java
View File

@ -1,7 +1,5 @@
package com.rusefi;
import org.jetbrains.annotations.NotNull;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@ -13,7 +11,7 @@ import java.util.function.Consumer;
* (c) Andrey Belomutskiy
*/
public class ExecHelper {
private static final String SIMULATOR_COMMAND = "../win32_functional_tests/build/rusefi_simulator.exe";
private static final String SIMULATOR_BINARY = "../simulator/build/rusefi_simulator.exe";
static Process simulatorProcess;
/**
@ -24,10 +22,10 @@ public class ExecHelper {
FileLog.MAIN.logLine("runSimulator...");
try {
FileLog.MAIN.logLine("Binary size: " + new File(SIMULATOR_COMMAND).length());
FileLog.MAIN.logLine("Binary size: " + new File(SIMULATOR_BINARY).length());
FileLog.MAIN.logLine("Executing " + SIMULATOR_COMMAND);
ExecHelper.simulatorProcess = Runtime.getRuntime().exec(SIMULATOR_COMMAND);
FileLog.MAIN.logLine("Executing " + SIMULATOR_BINARY);
ExecHelper.simulatorProcess = Runtime.getRuntime().exec(SIMULATOR_BINARY);
FileLog.MAIN.logLine("simulatorProcess: " + ExecHelper.simulatorProcess);
dumpProcessOutput(ExecHelper.simulatorProcess);
@ -93,6 +91,8 @@ public class ExecHelper {
}
public static void startSimulator() {
if (!new File(SIMULATOR_BINARY).exists())
throw new IllegalStateException(SIMULATOR_BINARY + " not found");
FileLog.MAIN.logLine("startSimulator...");
new Thread(new Runnable() {
@Override

2
java_console/build.xml
View File

@ -89,7 +89,7 @@
</target>
<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" args="start">
</java>
</target>

5
misc/jenkins/functional_test_and_build_bundle/run.bat
View File

@ -4,6 +4,11 @@ IF NOT ERRORLEVEL 0 echo build ERROR DETECTED
IF NOT ERRORLEVEL 0 EXIT /B 1
call misc/jenkins/functional_test_and_build_bundle/simulator_test.bat
IF NOT ERRORLEVEL 0 echo simulator test ERROR DETECTED
IF NOT ERRORLEVEL 0 EXIT /B 1
call misc/jenkins/functional_test_and_build_bundle/hw_test.bat
IF NOT ERRORLEVEL 0 echo real hardware test ERROR DETECTED
IF NOT ERRORLEVEL 0 EXIT /B 1