You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/05/09 22:15:52 UTC
incubator-geode git commit: Revert "GEODE-1360: Enabling to specify
log4j2.xml for junit/dunit/intgrationtest"
Repository: incubator-geode
Updated Branches:
refs/heads/develop 6c53d4f84 -> af119cfd3
Revert "GEODE-1360: Enabling to specify log4j2.xml for junit/dunit/intgrationtest"
This reverts commit 717ba5c8b45394c691b77d6a1bb83318bfa182da.
This commit caused all dunit tests to fail, because if the log4j file
was not specified, it added an empty parameter when launching the dunit
VMs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/af119cfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/af119cfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/af119cfd
Branch: refs/heads/develop
Commit: af119cfd38e4545b0d7deb0321f5142434fa5f5e
Parents: 6c53d4f
Author: Dan Smith <up...@apache.org>
Authored: Mon May 9 15:10:54 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon May 9 15:15:29 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java | 1 -
.../gemstone/gemfire/test/dunit/standalone/ProcessManager.java | 1 -
gradle/test.gradle | 4 ----
3 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af119cfd/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
index e06958a..0c294ec 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
@@ -75,7 +75,6 @@ public class DUnitLauncher {
/** change this to use a different log level in unit tests */
public static final String LOG_LEVEL = System.getProperty("logLevel", "info");
- public static final String LOG4J = System.getProperty("log4j.configurationFile");
static int locatorPort;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af119cfd/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index 489f72b..dd532c4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -172,7 +172,6 @@ public class ProcessManager {
"-Xrunjdwp:transport=dt_socket,server=y,suspend=" + jdkSuspend + jdkDebug,
"-XX:+HeapDumpOnOutOfMemoryError",
"-Xmx512m",
- DUnitLauncher.LOG4J==null?"":"-Dlog4j.configurationFile="+DUnitLauncher.LOG4J,
"-Dgemfire.DEFAULT_MAX_OPLOG_SIZE=10",
"-Dgemfire.disallowMcastDefaults=true",
"-ea", "-XX:+PrintGC", "-XX:+PrintGCDetails","-XX:+PrintGCTimeStamps",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af119cfd/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 96fbfc5..2dd7521 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -211,10 +211,6 @@ subprojects {
if (logLevel != null) {
systemProperty 'logLevel', logLevel
}
- def log4jLocation = System.getProperty('log4j.configurationFile')
- if (log4jLocation != null) {
- systemProperty 'log4j.configurationFile', log4jLocation
- }
def eol = System.getProperty('line.separator')
def progress = new File(resultsDir, "$test.name-progress.txt")