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/e02be316 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e02be316 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e02be316 Branch: refs/heads/feature/GEODE-3113 Commit: e02be316e17fbc539e94d8379a6bef31a0fd1fc5 Parents: 6e86762 Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Tue Jul 11 08:38:40 2017 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Tue Jul 11 08:40:14 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/e02be316/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; }
