Changeset: 5e6c0062393a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e6c0062393a
Modified Files:
java/embedded/pom.xml
java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
Branch: embedded-java
Log Message:
Use environmental variables for running mvn tests
diffs (32 lines):
diff --git a/java/embedded/pom.xml b/java/embedded/pom.xml
--- a/java/embedded/pom.xml
+++ b/java/embedded/pom.xml
@@ -64,7 +64,7 @@ MonetDB is an analytical database design
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<configuration>
-
<argLine>-Djava.library.path="/Users/dnedev/monetdb/installation/lib"</argLine>
+
<argLine>-Djava.library.path="${env.MONETDB_HOME}/lib"</argLine>
</configuration>
</plugin>
<plugin>
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
--- a/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
+++ b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
@@ -23,7 +23,7 @@ import org.monetdb.embedded.result.Embed
public class MonetDBEmbedded {
static {
// Load the embedded library
-// System.loadLibrary("embedded_java");
+ System.loadLibrary("embedded_java");
}
/**
* Flag if the embedded database was already started.
@@ -50,7 +50,6 @@ public class MonetDBEmbedded {
* @param silentFlag Silent flag
*/
public MonetDBEmbedded(final File databaseDirectory, final boolean
silentFlag) {
- System.loadLibrary("embedded_java");
if (!databaseDirectory.isDirectory()) {
throw new IllegalArgumentException(databaseDirectory +
" is not a directory");
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
