You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2016/01/12 17:12:26 UTC
incubator-systemml git commit: [HOTFIX] Fix various tests issues
(local test directory, missing input)
Repository: incubator-systemml
Updated Branches:
refs/heads/master 4d19a2097 -> 52fae50d5
[HOTFIX] Fix various tests issues (local test directory, missing input)
This change mainly fixes corrupted local test directories, which led to
side effects between concurrent testsuite runs (when ran through maven
verify).
Related to [SYSTEMML-149][SYSTEMML-146]
Partial revert of commit 96019cf5e2d62410a631f754c7654e27de842bf7
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/52fae50d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/52fae50d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/52fae50d
Branch: refs/heads/master
Commit: 52fae50d564a2f9305e118703b7e928fa978e318
Parents: 4d19a20
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Tue Jan 12 08:11:37 2016 -0800
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Tue Jan 12 08:11:56 2016 -0800
----------------------------------------------------------------------
.../apache/sysml/test/integration/AutomatedTestBase.java | 11 ++++++++---
src/test/scripts/functions/aggregate/ColSumTest.dml | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/52fae50d/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
index 9688754..92e4acad 100644
--- a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
@@ -825,10 +825,15 @@ public abstract class AutomatedTestBase
// Create a SystemML config file for this test case.
// Use the canned file under src/test/config as a template
- String configTemplate = FileUtils.readFileToString(CONFIG_TEMPLATE_FILE,
- "UTF-8");
+ String configTemplate = FileUtils.readFileToString(CONFIG_TEMPLATE_FILE, "UTF-8");
- FileUtils.write(getCurConfigFile(), configTemplate, "UTF-8");
+ String localTemp = curLocalTempDir.getPath();
+ String configContents = configTemplate.replace("<scratch>scratch_space</scratch>",
+ String.format("<scratch>%s/scratch_space</scratch>", localTemp));
+ configContents = configContents.replace("<localtmpdir>/tmp/systemml</localtmpdir>",
+ String.format("<localtmpdir>%s/localtmp</localtmpdir>", localTemp));
+
+ FileUtils.write(getCurConfigFile(), configContents, "UTF-8");
System.out.printf(
"This test case will use SystemML config file %s\n",
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/52fae50d/src/test/scripts/functions/aggregate/ColSumTest.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/aggregate/ColSumTest.dml b/src/test/scripts/functions/aggregate/ColSumTest.dml
index a1fd440..2533c89 100644
--- a/src/test/scripts/functions/aggregate/ColSumTest.dml
+++ b/src/test/scripts/functions/aggregate/ColSumTest.dml
@@ -21,8 +21,6 @@
# junit test class: org.apache.sysml.test.integration.functions.aggregate.ColSumTest.java
-$$readhelper$$
-
Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
VectorColSum = colSums(Vector);
write(VectorColSum, "$$outdir$$vector_colsum", format="text");