Commit efef4169 authored by Donald H. (Donnie) Pinkston, III's avatar Donald H. (Donnie) Pinkston, III
Browse files

Improve support for NanoDB on Windows

Updated the nanodb script to properly handle being run under Git Bash.
Needed to wrap the Java program with "winpty" when starting it from Git
Bash.

Also updated the Surefire configuration to not require all tests to pass
before building a JAR file.  There are a few tests that aren't working
on Windows due to file-locking differences from *NIX.
parent 8b85c48f
No related merge requests found
Showing with 17 additions and 8 deletions
+17 -8
......@@ -19,14 +19,21 @@ JAVA_OPTS="-Dlog4j.configurationFile=log4j2.properties"
# uncomment this line:
# JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5009"
# See if we have the rlwrap utility; if so, it makes using NanoDB
# from the command-line sooo much nicer...
testrl=$(which rlwrap)
if [ -z "$testrl" ]
then
java $JAVA_OPTS "$@" -jar $NANODB_SERVER_JAR
PLATFORM=`uname`
if [[ $PLATFORM == *"MINGW"* ]]; then
# Windows, probably git bash
WRAPPER=winpty
else
rlwrap java $JAVA_OPTS "$@" -jar $NANODB_SERVER_JAR
# See if we have the rlwrap utility; if so, it makes using NanoDB
# from the command-line sooo much nicer...
testrl=$(which rlwrap)
if [ -z "$testrl" ]; then
# No wrapper
WRAPPER=
else
WRAPPER=rlwrap
fi
fi
$WRAPPER java $JAVA_OPTS "$@" -jar $NANODB_SERVER_JAR
......@@ -133,6 +133,8 @@
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<testFailureIgnore>true</testFailureIgnore>
<systemPropertyVariables>
<log4j.configurationFile>log4j2.properties</log4j.configurationFile>
</systemPropertyVariables>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment