Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

- Fixed paths to test files

  • Loading branch information...
commit 79fca2669850decea6800bde7adffc17a7c3101a 1 parent 0572255
authored

Showing 1 changed file with 15 additions and 15 deletions. Show diff stats Hide diff stats

  1. 30  Makefile.distrib
30  Makefile.distrib
@@ -30,7 +30,7 @@ ULTRAEDIT_LIST		+= scala.txt
30 30
 ULTRAEDIT_FILES		 = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%)
31 31
 
32 32
 # scala test
33  
-TEST_ROOT		 = $(PROJECT_ROOT)/test/files
  33
+TEST_ROOT		 = $(PROJECT_ROOT)/test
34 34
 TEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/test-pos.lst)
35 35
 TEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/test-neg.lst)
36 36
 TEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/test-run.lst)
@@ -116,20 +116,20 @@ install			: $(TOOLS_JAR_ARCHIVE)
116 116
 	$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)
117 117
 	$(INSTALL) -m 755 -d $(INSTALL_TESTDIR)/bin
118 118
 	$(INSTALL) -m 755 $(TEST_ROOT)/bin/scala-test $(INSTALL_TESTDIR)/bin
119  
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) $(TEST_LIST) \
120  
-	    $(INSTALL_TESTDIR))
121  
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
122  
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
123  
-	    $(INSTALL_TESTDIR))
124  
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
125  
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
126  
-	    $(INSTALL_TESTDIR))
127  
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
128  
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
129  
-	    $(INSTALL_TESTDIR))
130  
-	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
131  
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
132  
-	    $(INSTALL_TESTDIR))
  119
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files $(TEST_LIST) \
  120
+	    $(INSTALL_TESTDIR)/files)
  121
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
  122
+	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.check) 2>/dev/null) \
  123
+	    $(INSTALL_TESTDIR)/files)
  124
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
  125
+	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.flags) 2>/dev/null) \
  126
+	    $(INSTALL_TESTDIR)/files)
  127
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
  128
+	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.dtd) 2>/dev/null) \
  129
+	    $(INSTALL_TESTDIR)/files)
  130
+	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT)/files \
  131
+	    $(shell cd $(TEST_ROOT)/files; ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
  132
+	    $(INSTALL_TESTDIR)/files)
133 133
 
134 134
 install-windows		: install
135 135
 	@if [ ! -d "$(INSTALL_PREFIX)" ]; then \

0 notes on commit 79fca26

Please sign in to comment.
Something went wrong with that request. Please try again.