Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 31efb70

Browse files
committed
Adapted test configs to better run on the server.
1 parent 7fafe3e commit 31efb70

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ loc PHP_ANALYSIS = |mvn://org.rascalmpl!php-analysis!0.2.5-SNAPSHOT/!|;
3131
loc REPO = |file:///Users/paulklint/git/|;
3232
loc COMPILED_RASCAL
3333
= REPO + "compiled-rascal";
34+
loc TMP_COMPILED_RASCAL
35+
= |tmp:///compiled-rascal/|;
3436

3537
// ---- PathConfigs for testing purposes --------------------------------------
3638

@@ -86,14 +88,22 @@ public PathConfig getRascalProjectTestingPathConfig() {
8688
// ---- generic template for PathConfigs --------------------------------------
8789

8890
public PathConfig makePathConfig(loc repo, list[loc] sources, list[loc] libraries, bool compiler = false) {
91+
COMPILED = compiler ? COMPILED_RASCAL : TMP_COMPILED_RASCAL;
8992
return pathConfig(
9093
srcs = sources,
91-
bin = compiler ? COMPILED_RASCAL + "/target/classes" : repo,
92-
generatedSources = compiler ? COMPILED_RASCAL + "/src/main/java" : |unknown:///|,
93-
generatedTestSources = compiler ? COMPILED_RASCAL + "/src/test/java/" : |unknown:///|,
94-
resources = compiler ? COMPILED_RASCAL + "/src/main/java" : repo + "/rascal",
95-
testResources = compiler ? COMPILED_RASCAL + "/src/test/java/" : repo + "/rascal",
94+
bin = COMPILED + "/target/classes",
95+
generatedSources = COMPILED + "/src/main/java",
96+
generatedTestSources = COMPILED + "/src/test/java/",
97+
resources = COMPILED + "/src/main/java",
98+
testResources = COMPILED_RASCAL + "/src/test/java/",
9699
libs = libraries
100+
// srcs = sources,
101+
// bin = compiler ? COMPILED_RASCAL + "/target/classes" : repo,
102+
// generatedSources = compiler ? COMPILED_RASCAL + "/src/main/java" : |unknown:///|,
103+
// generatedTestSources = compiler ? COMPILED_RASCAL + "/src/test/java/" : |unknown:///|,
104+
// resources = compiler ? COMPILED_RASCAL + "/src/main/java" : repo + "/rascal",
105+
// testResources = compiler ? COMPILED_RASCAL + "/src/test/java/" : repo + "/rascal",
106+
// libs = libraries
97107
);
98108
}
99109

@@ -176,7 +186,7 @@ public PathConfig getRascalWritablePathConfig(bool compiler = true) {
176186
compiler=compiler);
177187
}
178188

179-
public RascalCompilerConfig getRascalCompilerConfig(bool compiler=true){
189+
public RascalCompilerConfig getRascalWritableCompilerConfig(bool compiler=true){
180190
return rascalCompilerConfig(getRascalWritablePathConfig(compiler=compiler))[verbose = true][logWrittenFiles=true];
181191
}
182192

0 commit comments

Comments
 (0)