From 7d34a112941e0b30fbe3faa9b360b829bedaaf21 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 17 Sep 2015 21:12:55 -0400
Subject: fix partest to work on Cygwin

note that the code removed here is inside an `if $cygwin; then` block,
so it can't affect other environments.
---
 test/partest | 1 -
 1 file changed, 1 deletion(-)

(limited to 'test')

diff --git a/test/partest b/test/partest
index f396459c6d..8b827f276f 100755
--- a/test/partest
+++ b/test/partest
@@ -112,7 +112,6 @@ if $cygwin; then
         JAVAC_CMD=`cygpath --$format "$JAVAC_CMD"`
     fi
     SCALA_HOME=`cygpath --$format "$SCALA_HOME"`
-    PARTEST_CLASSPATH=`cygpath --path --$format "$PARTEST_CLASSPATH"`
 fi
 
 # last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the
-- 
cgit v1.2.3


From 1fd171b581e808691f3f8a3051f850057c1cd571 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 17 Sep 2015 21:13:02 -0400
Subject: remove old partest.bat batch file

this hadn't been touched since 2013, and didn't work when I tried it
-- not surprisingly since the classpath stuff for partest changed a
lot when Scala was modularized.

the shell script works on Cygwin, so the bat file isn't needed.

further piece of evidence this file is abandoned and unused: at
https://issues.scala-lang.org/browse/SI-3290, in 2010, Lukas Rytz
wrote "i never heard somebody saying it was abandoned, but i never
heard of somebody using it either."
---
 test/partest.bat | 104 -------------------------------------------------------
 1 file changed, 104 deletions(-)
 delete mode 100755 test/partest.bat

(limited to 'test')

diff --git a/test/partest.bat b/test/partest.bat
deleted file mode 100755
index 1806e80888..0000000000
--- a/test/partest.bat
+++ /dev/null
@@ -1,104 +0,0 @@
-@echo off
-
-rem ##########################################################################
-rem # Scala code runner 2.9.1.final
-rem ##########################################################################
-rem # (c) 2002-2013 LAMP/EPFL
-rem #
-rem # This is free software; see the distribution for copying conditions.
-rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-rem # PARTICULAR PURPOSE.
-rem ##########################################################################
-
-rem We adopt the following conventions:
-rem - System/user environment variables start with a letter
-rem - Local batch variables start with an underscore ('_')
-
-if "%OS%"=="Windows_NT" (
-  @setlocal
-  call :set_home
-  set _ARGS=%*
-) else (
-  set _SCALA_HOME="%SCALA_HOME%"
-  rem The following line tests SCALA_HOME instead of _SCALA_HOME, because
-  rem the above change to _SCALA_HOME is not visible within this block.
-  if "%SCALA_HOME%"=="" goto error1
-  call :set_args
-)
-
-rem We use the value of the JAVACMD environment variable if defined
-set _JAVACMD=%JAVACMD%
-if "%_JAVACMD%"=="" set _JAVACMD=java
-
-rem We use the value of the JAVACCMD environment variable if defined
-set _JAVACCMD=%JAVACCMD%
-if "%_JAVACCMD%"=="" set _JAVACCMD=javac
-
-rem We use the value of the JAVA_OPTS environment variable if defined
-set _JAVA_OPTS=%JAVA_OPTS%
-if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx1024M -Xms64M
-
-rem We use the value of the SCALAC_OPTS environment variable if defined
-set _SCALAC_OPTS=%SCALAC_OPTS%
-if "%_SCALAC_OPTS%"=="" set _SCALAC_OPTS=-deprecation
-
-set _EXTENSION_CLASSPATH=
-if "%_EXTENSION_CLASSPATH%"=="" (
-  if exist "%_SCALA_HOME%\lib\scala-partest.jar" (
-    for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f"
-    if "%OS%"=="Windows_NT" (
-      for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f"
-    )
-  ) else if exist "%_SCALA_HOME%\build\pack\lib\scala-partest.jar" (
-    for %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f"
-    if "%OS%"=="Windows_NT" (
-      for /d %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f"
-    )  
-  )
-)
-
-set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%_JAVACCMD%"
-
-rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
-%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
-goto end
-
-rem ##########################################################################
-rem # subroutines
-
-:add_cpath
-  if "%_EXTENSION_CLASSPATH%"=="" (
-    set _EXTENSION_CLASSPATH=%~1
-  ) else (
-    set _EXTENSION_CLASSPATH=%_EXTENSION_CLASSPATH%;%~1
-  )
-goto :eof
-
-rem Variable "%~dps0" works on WinXP SP2 or newer
-rem (see http://support.microsoft.com/?kbid=833431)
-rem set _SCALA_HOME=%~dps0..
-:set_home
-  set _BIN_DIR=
-  for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi
-  set _SCALA_HOME=%_BIN_DIR%..
-goto :eof
-
-:set_args
-  set _ARGS=
-  :loop
-  rem Argument %1 may contain quotes so we use parentheses here
-  if (%1)==() goto :eof
-  set _ARGS=%_ARGS% %1
-  shift
-  goto loop
-
-rem ##########################################################################
-rem # errors
-
-:error1
-echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory.
-goto end
-
-:end
-if "%OS%"=="Windows_NT" @endlocal
-exit /b %errorlevel%
-- 
cgit v1.2.3