geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [57/58] [abbrv] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath
Date Mon, 17 Jul 2017 18:07:06 GMT
GEODE-3175 backward-compatibility tests fail with bad classpath

temporarily backing out removal of current-version class files and
resources to observe build behavior.


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

Branch: refs/heads/master
Commit: 964f2749065ce9c6898fd27983b43f1bd9fc77d0
Parents: 2cf335c
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Tue Jul 11 09:31:40 2017 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Tue Jul 11 09:31:40 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/geode/blob/964f2749/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..98b27a6 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,24 +178,25 @@ 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