From edd6d0a7ddf6c6a354b4d765f1736112e5f0945a Mon Sep 17 00:00:00 2001
From: Jonas <jonitro165@gmail.com>
Date: Tue, 24 Mar 2020 18:10:44 +0100
Subject: [PATCH] Compiler autolaunch update
---
build/test/compiler/compile | 0
src/var/FeatureModelImplGenerator/template/Main.jak | 7 ++-----
2 files changed, 2 insertions(+), 5 deletions(-)
mode change 100644 => 100755 build/test/compiler/compile
diff --git a/build/test/compiler/compile b/build/test/compiler/compile
old mode 100644
new mode 100755
diff --git a/src/var/FeatureModelImplGenerator/template/Main.jak b/src/var/FeatureModelImplGenerator/template/Main.jak
index d0651ad..505ec87 100644
--- a/src/var/FeatureModelImplGenerator/template/Main.jak
+++ b/src/var/FeatureModelImplGenerator/template/Main.jak
@@ -36,9 +36,7 @@ public class Configurator {
//path to the test manager
private String m_sTestManagerPath = "../../../build/sim/testmanager.sh";
//path to the testcase compliler
- private String m_sTestCaseCompilerPath = "../../../build/test/compiler/compiler.dll";
- //arguments for the testcase compiler
- private String[] m_aCompilerArgs = new String[] {"../../test/testfaelle", "../../../build/test/compiler/testfaelle"};
+ private String m_sTestCaseCompilerPath = "../../../build/test/compiler/compile";
//document representation of the feature model
private Document m_oFeatureModelDoc;
@@ -127,7 +125,7 @@ public class Configurator {
//TODO launch compiler
try {
- Process oTestCaseCompiler = oRuntime.exec("dotnet " + m_sTestManagerPath + " " + m_aCompilerArgs[0] + " " + m_aCompilerArgs[1]);
+ Process oTestCaseCompiler = oRuntime.exec(m_sTestCaseCompilerPath);
BufferedReader oOutput = new BufferedReader(new InputStreamReader(oTestCaseCompiler.getInputStream()));
String sOutput = null;
while ((sOutput = oOutput.readLine()) != null) {
@@ -139,7 +137,6 @@ public class Configurator {
//TODO launch test manager
try {
- Process oChMod = oRuntime.exec("chmod u+x"+ m_sTestManagerPath);
Process oTestManager = oRuntime.exec(m_sTestManagerPath);
BufferedReader oOutput = new BufferedReader(new InputStreamReader(oTestManager.getInputStream()));
String sOutput = null;
--
GitLab