diff options
| author | paltherr <paltherr@epfl.ch> | 2004-09-23 14:38:36 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-09-23 14:38:36 +0000 |
| commit | a1f8145d482b53ee25be7748c36244aaddcfeabb (patch) | |
| tree | 51f554731792375e7968ffaa449c85fb7f5030c8 /Makefile | |
| parent | ac5afb16a5408ced5c77d843e66eea9339a545e6 (diff) | |
| download | scala-a1f8145d482b53ee25be7748c36244aaddcfeabb.tar.gz scala-a1f8145d482b53ee25be7748c36244aaddcfeabb.tar.bz2 scala-a1f8145d482b53ee25be7748c36244aaddcfeabb.zip | |
- Cleaned code of scalatest
- Added some support to test .NET backend
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -311,6 +311,7 @@ $(SCRIPTS_WRAPPER_FILE) : MACRO_SCALA_CMD ?= $($(prefix)_SCALA_CMD) $(SCRIPTS_WRAPPER_FILE) : MACRO_SCALA_ARGS ?= $(SCRIPTS_WRAPPER_FILE) : MACRO_TEST_SRCDIR ?= $(PROJECT_TESTDIR) $(SCRIPTS_WRAPPER_FILE) : MACRO_TEST_OBJDIR ?= "" +$(SCRIPTS_WRAPPER_FILE) : MACRO_TEST_ASSEMBLIES ?= -r $(MSIL_HOME) $(SCRIPTS_WRAPPER_FILE) : $(VERSION_FILE) $(SCRIPTS_WRAPPER_FILE) : $(PROJECT_ROOT)/Makefile $(SCRIPTS_WRAPPER_FILE) : $(PROJECT_ROOT)/Makefile.config @@ -333,6 +334,7 @@ $(SCRIPTS_WRAPPER_FILE) : $(SCRIPTS_TEMPLATE_FILE) $(call SCRIPTS_MACRO,SCALA_ARGS) \ $(call SCRIPTS_MACRO,TEST_SRCDIR) \ $(call SCRIPTS_MACRO,TEST_OBJDIR) \ + $(call SCRIPTS_MACRO,TEST_ASSEMBLIES) \ $(SCRIPTS_TEMPLATE_FILE) > $@ @macros=`$(SED) -n -es'@.*{#\(.*\)#}.*@\1@p' < $@`; \ if [ -n "$$macros" ]; then \ |