Changeset: 50e9cbf3ce87 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/50e9cbf3ce87
Modified Files:
src/test/java/JDBC_API_Tester.java
src/test/java/JUnitTester.java
src/test/java/org/monetdb/testinfra/Config.java
Branch: default
Log Message:
Get rid of skipMALoutput
diffs (66 lines):
diff --git a/src/test/java/JDBC_API_Tester.java
b/src/test/java/JDBC_API_Tester.java
--- a/src/test/java/JDBC_API_Tester.java
+++ b/src/test/java/JDBC_API_Tester.java
@@ -70,7 +70,6 @@ public final class JDBC_API_Tester exten
private boolean isPostMar2025;
private boolean isPostDec2025; // Dec2025-SP1 or later;
private boolean isAtLeast56;
- private boolean skipMALoutput = Config.isSkipMalOutput();
private boolean supportsNestedTypes;
final private static int sbInitLen = 5468; // max needed size of sb
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
@@ -23,7 +23,6 @@ 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");
@@ -39,7 +38,7 @@ public abstract class JUnitTester {
} else if (arg.equals("-supportsNestedTypes")) {
; // sometimes passed to JDBC_API_Tester,
autodetected now, ignore it
} else if (arg.equals("-skipMALoutput")) {
- skipMALoutput = "true";
+ ; // sometimes passed to JDBC_API_Tester,
autodetected now, ignore it
} else if (arg.startsWith("-")) {
System.err.println("Invalid flag " + arg);
exit(1);
@@ -60,10 +59,6 @@ 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);
diff --git a/src/test/java/org/monetdb/testinfra/Config.java
b/src/test/java/org/monetdb/testinfra/Config.java
--- a/src/test/java/org/monetdb/testinfra/Config.java
+++ b/src/test/java/org/monetdb/testinfra/Config.java
@@ -57,9 +57,6 @@ public class Config {
public static final String TLSTEST_ALIAS_ENVVAR = "MONETDB_TLS_ALTURL";
public static final String TLSTEST_ALIAS_DEFAULT =
"jdbc:monetdbs://monetdbxyz.ergates.nl/demo";
- public static final String SKIP_MALOUTPUT_PROPERTY =
"test.skipmaloutput";
- public static final String SKIP_MALOUTPUT_ENVVAR =
"MONETDB_TEST_SKIP_MAL_OUTPUT";
-
public static final String SKIP_SLOW_PROPERTY = "test.skipslow";
public static final String SKIP_SLOW_ENVVAR = "MONETDB_TEST_SKIP_SLOW";
@@ -124,10 +121,6 @@ public class Config {
return addDefaultCredentials(jdbcUrl);
}
- public static boolean isSkipMalOutput() {
- return Boolean.parseBoolean(lookup(SKIP_MALOUTPUT_PROPERTY,
SKIP_MALOUTPUT_ENVVAR, "false"));
- }
-
public static boolean isSkipSlow() {
return Boolean.parseBoolean(lookup(SKIP_SLOW_PROPERTY,
SKIP_SLOW_ENVVAR, "false"));
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
