geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [41/50] [abbrv] geode git commit: GEODE-3139 remove geode-core/src/main artifacts from classpath of backward-compatibility tests
Date Thu, 06 Jul 2017 18:27:15 GMT
GEODE-3139 remove geode-core/src/main artifacts from classpath of backward-compatibility tests

disabling the removal of current-version product files from
backward-compatibility
VMs.  These changes seem to have messed up some test environments.
I'll reenable the removals once the issues have been cleared up.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f1161994
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f1161994
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f1161994

Branch: refs/heads/feature/GEODE-1279
Commit: f1161994a12adb42c8b8d6eddfaa4c45de92764f
Parents: aa68f04
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Fri Jun 30 15:43:26 2017 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Fri Jun 30 15:43:26 2017 -0700

----------------------------------------------------------------------
 .../test/dunit/standalone/ProcessManager.java   | 39 ++++++++++----------
 1 file changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/f1161994/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index 9e62484..0170b26 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -178,25 +178,26 @@ public class ProcessManager {
       classPath = dunitClasspath;
     } else {
       // remove current-version product classes and resources from the classpath
-      String buildDir = separator + "geode-core" + separator + "build" + separator;
-
-      String mainClasses = buildDir + "classes" + separator + "main";
-      dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
-
-      String mainResources = buildDir + "resources" + separator + "main";
-      dunitClasspath = removeFromPath(dunitClasspath, mainResources);
-
-      String generatedResources = buildDir + "generated-resources" + separator + "main";
-      dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
-
-      buildDir = separator + "geode-common" + separator + "build" + separator + "classes"
-          + separator + "main";
-      dunitClasspath = removeFromPath(dunitClasspath, buildDir);
-
-      buildDir = separator + "geode-json" + separator + "build" + separator + "classes" +
separator
-          + "main";
-      dunitClasspath = removeFromPath(dunitClasspath, buildDir);
-
+      // String buildDir = separator + "geode-core" + separator + "build" + separator;
+      //
+      // String mainClasses = buildDir + "classes" + separator + "main";
+      // dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
+      //
+      // String mainResources = buildDir + "resources" + separator + "main";
+      // dunitClasspath = removeFromPath(dunitClasspath, mainResources);
+      //
+      // String generatedResources = buildDir + "generated-resources" + separator + "main";
+      // dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
+      //
+      // buildDir = separator + "geode-common" + separator + "build" + separator + "classes"
+      // + separator + "main";
+      // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+      //
+      // buildDir = separator + "geode-json" + separator + "build" + separator + "classes"
+
+      // separator
+      // + "main";
+      // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+      //
       classPath = versionManager.getClasspath(version) + File.pathSeparator + dunitClasspath;
     }
 


Mime
View raw message