Changeset: fe9e49d600cd for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/fe9e49d600cd
Modified Files:
src/test/java/JUnitTester.java
Branch: mvn
Log Message:
Restore -skipMALoutput
Accidentally removed it
diffs (46 lines):
diff --git a/src/test/java/JUnitTester.java b/src/test/java/JUnitTester.java
--- a/src/test/java/JUnitTester.java
+++ b/src/test/java/JUnitTester.java
@@ -1,3 +1,4 @@
+import org.monetdb.testinfra.Config;
import org.monetdb.testinfra.MtestLauncher;
import static java.lang.System.exit;
@@ -22,6 +23,7 @@ public abstract class JUnitTester {
*/
public static void runTests(String tags, String property, String[]
args) {
String value = null;
+ String skipMALoutput = null;
boolean verbose = false;
System.err.println("# Invoked with " + args.length + " args");
@@ -30,12 +32,14 @@ public abstract class JUnitTester {
for (int i = 0; i < args.length; i++) {
String arg = args[i];
- if (arg.equals("-v"))
+ if (arg.equals("-v")) {
verbose = true;
- else if (arg.equals("-a"))
+ } else if (arg.equals("-a")) {
i++ /* sometimes passed to TLSTester, ignore
following argument */;
- else if (arg.equals("-supportsNestedTypes")) {
- /* sometimes passed to JDBC_API_Tester,
autodetected now, ignore it */;
+ } else if (arg.equals("-supportsNestedTypes")) {
+ ; // sometimes passed to JDBC_API_Tester,
autodetected now, ignore it
+ } else if (arg.equals("-skipMALoutput")) {
+ skipMALoutput = "true";
} else if (arg.startsWith("-")) {
System.err.println("Invalid flag " + arg);
exit(1);
@@ -56,6 +60,10 @@ public abstract class JUnitTester {
launcher.logAlways().println("Command line: setting " +
property + " to " + value);
System.setProperty(property, value);
}
+ if (skipMALoutput != null) {
+ launcher.logAlways().println("Command line: setting " +
Config.SKIP_MALOUTPUT_PROPERTY + " to " + skipMALoutput);
+ System.setProperty(Config.SKIP_MALOUTPUT_PROPERTY,
skipMALoutput);
+ }
int status = launcher.run();
System.exit(status);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
