Tuning test configd to fix last failing test

Author: PaulKlint

src/org/rascalmpl/core/library/lang/rascalcore/check/TestConfigs.rsc

@@ -15,23 +15,23 @@ data PathConfig(
 
 // ----  Various PathConfigs  ---------------------------------------------
 
-loc RASCAL        = |mvn://org.rascalmpl!rascal!0.40.17/!|;
-loc TYPEPAL       = |mvn://org.rascalmpl!typepal!0.14.8/!|;
-loc OUTDATED_TYPEPAL 
+public loc RASCAL        = |mvn://org.rascalmpl!rascal!0.40.17/!|;
+public loc TYPEPAL       = |mvn://org.rascalmpl!typepal!0.14.8/!|;
+public loc OUTDATED_TYPEPAL 
                   = |mvn://org.rascalmpl!typepal!0.14.1/!|;
-loc RASCAL_CORE   = |mvn://org.rascalmpl!rascal-core!0.12.14/!|;
+public loc RASCAL_CORE   = |mvn://org.rascalmpl!rascal-core!0.12.14/!|;
 
-loc DRAMBIGUITY   = |mvn://org.rascalmpl!drambiguity!0.1.2/!|;
-loc FLYBYTES      = |mvn://org.rascalmpl!flybytes!0.1.5/!|;
-loc SALIX_CORE    = |mvn://org.rascalmpl!salix-core!0.2.7/!|;
-loc SALIX_CONTRIB = |mvn://org.rascalmpl!salix-contrib!0.2.7/!|;
-loc RASCAL_LSP    = |mvn://org.rascalmpl!rascal-language-server!0.12.1/!|;
-loc PHP_ANALYSIS  = |mvn://org.rascalmpl!php-analysis!0.2.5-SNAPSHOT/!|;
+public loc DRAMBIGUITY   = |mvn://org.rascalmpl!drambiguity!0.1.2/!|;
+public loc FLYBYTES      = |mvn://org.rascalmpl!flybytes!0.1.5/!|;
+public loc SALIX_CORE    = |mvn://org.rascalmpl!salix-core!0.2.7/!|;
+public loc SALIX_CONTRIB = |mvn://org.rascalmpl!salix-contrib!0.2.7/!|;
+public loc RASCAL_LSP    = |mvn://org.rascalmpl!rascal-language-server!0.12.1/!|;
+public loc PHP_ANALYSIS  = |mvn://org.rascalmpl!php-analysis!0.2.5-SNAPSHOT/!|;
 
-loc REPO          =  |file:///Users/paulklint/git/|;
-loc COMPILED_RASCAL 
+public loc REPO          =  |file:///Users/paulklint/git/|;
+public loc COMPILED_RASCAL 
                   =  REPO + "compiled-rascal";
-loc TMP_COMPILED_RASCAL 
+public loc TMP_COMPILED_RASCAL 
                   = |tmp:///compiled-rascal/|;
 
 // ---- PathConfigs for testing purposes --------------------------------------
@@ -95,11 +95,11 @@ public PathConfig makePathConfig(list[loc] sources, list[loc] libraries, bool ke
    COMPILED = keep ? COMPILED_RASCAL : TMP_COMPILED_RASCAL;
    return pathConfig(
         srcs                 = sources,
-        bin                  = COMPILED + "/target/classes",
+        bin                  = COMPILED + (keep ? "/target/classes" : "rascal"),
         generatedSources     = COMPILED + "/src/main/java",
         generatedTestSources = COMPILED + "/src/test/java/",
-        resources            = COMPILED + "/src/main/java",
-        testResources        = COMPILED_RASCAL + "/src/test/java/",
+        resources            = COMPILED + (keep ? "/src/main/java" : "rascal"),
+        testResources        = COMPILED_RASCAL + (keep ? "/src/test/java/" : "rascal"),
         libs                 = libraries
         // srcs                 = sources,
         // bin                  = keep ? COMPILED_RASCAL + "/target/classes" : repo,
@@ -175,6 +175,16 @@ public RascalCompilerConfig getRascalCompilerConfig(bool keep=true){
     return rascalCompilerConfig(getRascalPathConfig(keep=keep))[verbose = true][logWrittenFiles=true];
 }
 
+public PathConfig getRascalAsLibPathConfig(bool keep = false) {
+    return pathConfig(
+        srcs = [  ],
+        bin = RASCAL + "rascal",
+        generatedSources = RASCAL,
+        resources = RASCAL + "rascal",
+        libs = [ RASCAL]
+    );
+}
+
 public PathConfig getRascalWritablePathConfig(bool keep = false) {
     TMP_RASCAL = |tmp:///rascal/|;
     copy(RASCAL, TMP_RASCAL, recursive=true, overwrite=true);

src/org/rascalmpl/core/library/lang/rascalcore/check/tests/BinaryDependencyTests.rsc

@@ -170,7 +170,7 @@ test bool importSimpleSourceModuleWithRascalAsLib(){
 
     assert checkExpectNoErrors("Lib", lib.pcfg);
 
-    rascalPCFG = getRascalPathConfig();
+    rascalBin = RASCAL;
     clientName = "test-project";
     client =
         createProject(
@@ -183,7 +183,7 @@ test bool importSimpleSourceModuleWithRascalAsLib(){
                         '  return 0;
                         '}"),
             createPathConfig(clientName)
-                    [libs=[rascalPCFG.resources]]
+                    [libs=[rascalBin]]
                     [srcs=[src(clientName), src(libName)]]
                 );
     return checkExpectNoErrors("LibCall", client.pcfg, remove = [lib, client]);