diff options
| -rw-r--r-- | src/build/pack.xml | 2 | ||||
| -rwxr-xr-x | test/scalatest | 9 | ||||
| -rw-r--r-- | test/scalatest.bat | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index 7ae3e29091..b6b24c5b43 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -109,7 +109,7 @@ MAIN DISTRIBUTION SBAZ desc="The Scala test package contains everything needed to test Scala." link="${sbaz.universe}/scala-test-${version.number}.sbp"> <binset dir="${basedir}/test" - includes="clitest,diff/diff.*,diff/lib*.dll,scalatest,scalatest.bat,partest,partest.bat"/> + includes="clitest,diff/diff.*,diff/lib*.dll,partest,partest.bat"/> <miscset dir="${basedir}/test" includes="files/**/*.args,files/**/*.check,files/**/*.jar,files/**/*.java,files/**/*.scala,files/**/*.flags,files/cli/**/*.check.*,files/jvm/*.so,files/shootout/*.javaopts,files/shootout/*.runner,files/shootout/*.txt"/> <!-- <srcset dir="${dist.dir}/src" includes="scala-partest-src.jar"/> --> diff --git a/test/scalatest b/test/scalatest index a42fb0c301..d3e5fdc860 100755 --- a/test/scalatest +++ b/test/scalatest @@ -626,6 +626,15 @@ PREFIX=`cd "$PREFIX"; pwd`; ############################################################################## # Invocation of $SCRIPT +# Print deprecation warning +echo "######################################################################" +echo "## DEPRECATION WARNING ##" +echo "######################################################################" +echo "## The 'scalatest' runner script has been deprecated. Please use ##" +echo "## 'partest' instead. ##" +echo "######################################################################" +echo "" + NORUN="false"; SHOWLOG="false"; SHOWDIFF="false"; diff --git a/test/scalatest.bat b/test/scalatest.bat index d66a7c5f7d..a280958e34 100644 --- a/test/scalatest.bat +++ b/test/scalatest.bat @@ -12,6 +12,14 @@ rem We adopt the following conventions: rem - System/user environment variables start with a letter
rem - Local batch variables start with an underscore ('_')
+echo ######################################################################
+echo ## DEPRECATION WARNING ##
+echo ######################################################################
+echo ## The 'scalatest' runner script has been deprecated. Please use ##
+echo ## 'partest' instead. ##
+echo ######################################################################
+echo.
+
if "%OS%"=="Windows_NT" (
@setlocal
call :set_home
|