summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--sources/bin/.scala_wrapper.tmpl6
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index de0ec7ff1c..c59e54defe 100644
--- a/Makefile
+++ b/Makefile
@@ -310,6 +310,7 @@ SCRIPTS_ALIASES_NAMES += scalaint-debug
#SCRIPTS_ALIASES_NAMES += dtd2scala
SCRIPTS_ALIASES_NAMES += scalap
SCRIPTS_ALIASES_NAMES += scalatest
+SCRIPTS_ALIASES_NAMES += scalanstest
SCRIPTS_ALIASES_FILES += $(SCRIPTS_ALIASES_NAMES:%=$(SCRIPTS_BINARYDIR)/%)
SCRIPTS_MACRO = -es@{\#$(1)\#}@'"$(MACRO_$(1):$(SCRIPTS_PREFIX)/%=$$PREFIX/%)"'@g
diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl
index 2bf83ae39c..49173cffea 100644
--- a/sources/bin/.scala_wrapper.tmpl
+++ b/sources/bin/.scala_wrapper.tmpl
@@ -912,6 +912,11 @@ test_main() {
DTD2SCALA="$PREFIX/bin/dtd2scala";
DIFF="diff";
+ case "$SCRIPT" in
+ scalanstest* )
+ SOCOS="$PREFIX/bin/scalansc";;
+ esac;
+
case `uname` in
CYGWIN* )
DIFF="diff --text --strip-trailing-cr";
@@ -1063,6 +1068,7 @@ case "$SCRIPT" in
scalap* ) tool_start "" scala.tools.scalap.Main "$@";;
dtd2scala* ) tool_start "" scala.tools.dtd2scala.Main "$@";;
scalatest* ) test_main "$@";;
+ scalanstest* ) test_main "$@";;
* ) abort "Don't know what to do for $SCRIPT.";;
esac;