From e0fa1563de11e6afe9b1c1fb233e23005ccac561 Mon Sep 17 00:00:00 2001
From: paltherr <paltherr@epfl.ch>
Date: Tue, 21 Sep 2004 14:38:11 +0000
Subject: - Removed ./test/bin/scala-test from distrib

- Relocated test files in distrib from ./test/files to ./test
---
 Makefile.config                 |  2 +-
 Makefile.distrib                | 46 ++++++++++++++++++++---------------------
 sources/bin/.scala_wrapper.tmpl |  2 +-
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index 0722b0b198..b8e81b660f 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -21,7 +21,7 @@ PROJECT_SUPPORTDIR	?= $(PROJECT_ROOT)/support
 PROJECT_SOURCEDIR	?= $(PROJECT_ROOT)/sources
 PROJECT_OBJECTDIR	?= $(PROJECT_ROOT)/objects
 PROJECT_WEBSITEDIR	?= $(PROJECT_ROOT)/website
-PROJECT_TESTDIR		?= $(PROJECT_ROOT)/test
+PROJECT_TESTDIR		?= $(PROJECT_ROOT)/test/files
 PROJECT_HTDOCSDIR	?= $(PROJECT_WEBSITEDIR)/htdocs
 PROJECT_DISTRIBDIR	?= $(PROJECT_ROOT)/distribs
 PROJECT_ARCHIVEDIR	?= $(PROJECT_DISTRIBDIR)
diff --git a/Makefile.distrib b/Makefile.distrib
index 1f401661ca..683e2b6543 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -30,11 +30,11 @@ ULTRAEDIT_LIST		+= scala.txt
 ULTRAEDIT_FILES		 = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%)
 
 # scala test
-TEST_ROOT		 = $(PROJECT_ROOT)/test
+TEST_ROOT		 = $(PROJECT_TESTDIR)
 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)
-TEST_FILES		 = $(TEST_LIST:%=$(TEST_ROOT)/files/%)
+TEST_FILES		 = $(TEST_LIST:%=$(TEST_ROOT)/%)
 
 ##############################################################################
 # beta versions
@@ -122,28 +122,26 @@ install			: $(TOOLS_JAR_ARCHIVE)
 	$(strip $(MIRROR) -m 644 -p -C $(ULTRAEDIT_ROOT) $(ULTRAEDIT_LIST) \
 	    $(INSTALL_SUPPORTDIR)/ultraedit)
 	$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)
-	$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)/bin
-	$(INSTALL) -m 755 $(TEST_ROOT)/bin/scala-test $(INSTALL_TESTDIR)/bin
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files $(TEST_LIST) \
-	    $(INSTALL_TESTDIR)/files)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
-	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
-	    $(INSTALL_TESTDIR)/files)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
-	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
-	    $(INSTALL_TESTDIR)/files)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
-	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.args) 2>/dev/null) \
-	    $(INSTALL_TESTDIR)/files)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
-	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
-	    $(INSTALL_TESTDIR)/files)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
-	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.namespace) 2>/dev/null) \
-	    $(INSTALL_TESTDIR)/files)
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
-	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
-	    $(INSTALL_TESTDIR)/files)
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) $(TEST_LIST) \
+	    $(INSTALL_TESTDIR))
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
+	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
+	    $(INSTALL_TESTDIR))
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
+	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
+	    $(INSTALL_TESTDIR))
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
+	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.args) 2>/dev/null) \
+	    $(INSTALL_TESTDIR))
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
+	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
+	    $(INSTALL_TESTDIR))
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
+	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.namespace) 2>/dev/null) \
+	    $(INSTALL_TESTDIR))
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
+	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
+	    $(INSTALL_TESTDIR))
 
 install-windows		: install
 	@if [ ! -d "$(INSTALL_PREFIX)" ]; then \
diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl
index 6ff66f1c68..21811e9ea6 100644
--- a/sources/bin/.scala_wrapper.tmpl
+++ b/sources/bin/.scala_wrapper.tmpl
@@ -869,7 +869,7 @@ test_main() {
     SUCCESS_COUNT=0;
     FAILURE_COUNT=0;
     TESTROOT=`dirname "$default_LIBRARY_SOURCES"`;
-    SRCDIR={#TEST_SRCDIR#}/files;
+    SRCDIR={#TEST_SRCDIR#};
     OBJDIR={#TEST_OBJDIR#};
 
     TEST_ALL="true";
-- 
cgit v1.2.3