Merge pull request #50 from eMoflon/hotfix/com-ilp-solver-settings-cli

Fixes commercial ILP solver tests when ran on the CLI

org.emoflon.ilp.tests/src/org/emoflon/ilp/tests/CplexTest.java

@@ -659,7 +659,9 @@ public void testCompareSOS1toSubstitution() {
 		solver.solve();
 		solver.updateValuesFromSolution();
 
-		solver.terminate();
+		// No termination because we use the same solver again for the second half of
+		// this test
+		// solver.terminate();
 
 		// Now with substitution instead of Gurobi SOS1 Constraints
 

pom.xml

@@ -14,6 +14,7 @@
 		<tycho.version>4.0.4</tycho.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.resource.version>3.3.1</maven.resource.version>
+		<ld.library.path>/opt/gurobi1003/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/</ld.library.path>
 	</properties>
 
 	<modules>
@@ -69,6 +70,16 @@
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>${maven.resource.version}</version>
 			</plugin>
+			<plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-surefire-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <configuration combine.self="override">
+                    <environmentVariables>
+                        <LD_LIBRARY_PATH>${ld.library.path}</LD_LIBRARY_PATH>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 

scripts/env.sh

@@ -1,5 +1,4 @@
-set -e
-export LD_LIBRARY_PATH=/opt/gurobi1003/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/
-export GUROBI_HOME=/opt/gurobi1003/linux64/
-export GRB_LICENSE_FILE=/home/mkratz/gurobi.lic
-export PATH=$PATH:/opt/gurobi1003/linux64/bin:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/
+LD_LIBRARY_PATH=/opt/gurobi1003/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/
+GUROBI_HOME=/opt/gurobi1003/linux64/
+GRB_LICENSE_FILE=/home/mkratz/gurobi.lic
+PATH=$PATH:/opt/gurobi1003/linux64/bin:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/