summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.distrib2
-rw-r--r--config/list/test-neg.lst2
-rw-r--r--config/list/test-pos.lst2
-rw-r--r--config/list/test-run.lst57
4 files changed, 31 insertions, 32 deletions
diff --git a/Makefile.distrib b/Makefile.distrib
index e1c0c3e29f..3e8bb45530 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -30,7 +30,7 @@ ULTRAEDIT_LIST += scala.txt
ULTRAEDIT_FILES = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%)
# scala test
-TEST_ROOT = $(PROJECT_ROOT)/test
+TEST_ROOT = $(PROJECT_ROOT)/test/files
TEST_LIST += $(call READLIST,$(PROJECT_LISTDIR)/test-pos.lst)
TEST_LIST += $(call READLIST,$(PROJECT_LISTDIR)/test-neg.lst)
TEST_LIST += $(call READLIST,$(PROJECT_LISTDIR)/test-run.lst)
diff --git a/config/list/test-neg.lst b/config/list/test-neg.lst
index 6b74dff1be..39502d0723 100644
--- a/config/list/test-neg.lst
+++ b/config/list/test-neg.lst
@@ -1,5 +1,5 @@
############################################################-*-Makefile-*-####
-# negative compilation test files (paths are relative to ./test)
+# negative compilation test files (paths are relative to ./test/files)
##############################################################################
# $Id$
diff --git a/config/list/test-pos.lst b/config/list/test-pos.lst
index 775058644a..60a470f484 100644
--- a/config/list/test-pos.lst
+++ b/config/list/test-pos.lst
@@ -1,5 +1,5 @@
############################################################-*-Makefile-*-####
-# positive compilation test files (paths are relative to ./test)
+# positive compilation test files (paths are relative to ./test/files)
##############################################################################
# $Id$
diff --git a/config/list/test-run.lst b/config/list/test-run.lst
index 4a8f87f941..f62bc55639 100644
--- a/config/list/test-run.lst
+++ b/config/list/test-run.lst
@@ -1,37 +1,36 @@
############################################################-*-Makefile-*-####
-# runtime test files (paths are relative to ./test)
+# runtime test files (paths are relative to ./test/files)
##############################################################################
# $Id$
-files/jvm/JavaInteraction.scala
+jvm/JavaInteraction.scala
-files/run/Course-2002-01.scala
-files/run/Course-2002-02.scala
-files/run/Course-2002-03.scala
-files/run/Course-2002-04.scala
-files/run/Course-2002-05.scala
-files/run/Course-2002-06.scala
-files/run/Course-2002-07.scala
-files/run/Course-2002-08.scala
-files/run/Course-2002-09.scala
-files/run/Course-2002-10.scala
-files/run/Course-2002-13.scala
-files/run/NestedClasses.scala
-files/run/arrays.scala
-files/run/bridges.scala
-files/run/bugs.scala
-files/run/exceptions.scala
-files/run/imports.scala
-files/run/iq.scala
-files/run/lisp.scala
-files/run/map_test.scala
-files/run/misc.scala
-files/run/overloads.scala
-files/run/regularpatmat.scala
-files/run/runtime.scala
-
-files/xml/lnk.scala
-files/xml/xhtml.scala
+run/Course-2002-01.scala
+run/Course-2002-02.scala
+run/Course-2002-03.scala
+run/Course-2002-04.scala
+run/Course-2002-05.scala
+run/Course-2002-06.scala
+run/Course-2002-07.scala
+run/Course-2002-08.scala
+run/Course-2002-09.scala
+run/Course-2002-10.scala
+run/Course-2002-13.scala
+run/NestedClasses.scala
+run/arrays.scala
+run/bridges.scala
+run/bugs.scala
+run/exceptions.scala
+run/imports.scala
+run/iq.scala
+run/lisp.scala
+run/map_test.scala
+run/misc.scala
+run/overloads.scala
+run/regularpatmat.scala
+run/runtime.scala
+xml/lnk.scala
+xml/xhtml.scala
##############################################################################