[07/16] incubator-edgent git commit: more test7 test classpath adjustment

[dl...@apache.org]

more test7 test classpath adjustment


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/3d95f500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/3d95f500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/3d95f500

Branch: refs/heads/master
Commit: 3d95f50014075870ee8cf3b3e89b2c7fa24355b0
Parents: 7f10262
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Sep 22 17:45:03 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 27 16:04:08 2016 -0400

----------------------------------------------------------------------
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3d95f500/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2657beb..f61817c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -461,11 +461,15 @@ subprojects {
         // Change from using the normal test classes dir to the java7 test classes dir
         classpath -= files(sourceSets.test.output.classesDir)
         classpath = files(sourceSets.test.output.classesDir.toString().replace('test', 'java7Test')) + classpath
+        
+        // Some of the tests have dependencies on other tests, adjust those classpaths too
+        classpath = files(classpath.collect { it.toString().replace('build/classes/test/', 'build/classes/java7test/') })
       
         // Switch from java8 jars to java7 jars
         classpath = files(classpath.collect { it.toString().replace('java8', 'java7') })
       }
       logger.debug "$project.path test.classpath: " + classpath.collect { it.toString() }
+println "#### $project.path test.classpath: " + classpath.collect { it.toString() }
     }
   }