Skip to content

Commit feac0c9

Browse files
committed
addressed review
1 parent 9691698 commit feac0c9

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ jobs:
158158
run: '"C:\Program Files\Git\bin\bash" ./project/scripts/winCmdTests'
159159
shell: cmd
160160

161+
- name: win tests
162+
run: './project/scripts/winCmdTests.bat'
163+
shell: cmd
164+
161165
- name: Scala.js Test
162166
run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
163167
shell: cmd

dist/bin/common.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,3 @@ for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-reader-3*"') do set "_JLI
5252
for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-3*"') do set "_JLINE_TERMINAL=%_LIB_DIR%\%%f"
5353
for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jna-3*"') do set "_JLINE_TERMINAL_JNA=%_LIB_DIR%\%%f"
5454
for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*jna-5*"') do set "_JNA=%_LIB_DIR%\%%f"
55-
56-
@rem debug
57-
set _DEBUG_STR=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005

dist/bin/scala.bat

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if %_EXECUTE_SCRIPT%==1 (
5050
if %_WITH_COMPILER%==1 (
5151
set "_CP_ARG=!_CP_ARG!%_PSEP%%_SCALA3_COMP%%_PSEP%%_TASTY_CORE%%_PSEP%%_SCALA3_INTF%%_PSEP%%_SCALA_ASM%%_PSEP%%_SCALA3_STAGING%%_PSEP%%_SCALA3_TASTY_INSPECTOR%"
5252
)
53-
set _JAVA_ARGS=%_JAVA_DEBUG% -classpath "!_CP_ARG!" %_JVM_OPTS% %_RESIDUAL_ARGS%
53+
set _JAVA_ARGS=-classpath "!_CP_ARG!" %_JVM_OPTS% %_RESIDUAL_ARGS%
5454
call "%_JAVACMD%" !_JAVA_ARGS!
5555
if not !ERRORLEVEL!==0 ( set _EXITCODE=1& goto end )
5656
) else (
@@ -70,7 +70,6 @@ set _EXECUTE_RUN=0
7070
set _EXECUTE_SCRIPT=0
7171
set _TARGET_SCRIPT=
7272
set _WITH_COMPILER=0
73-
set _JAVA_DEBUG=
7473
set _CLASS_PATH_COUNT=0
7574
set _CLASS_PATH=
7675
set _JVM_OPTS=
@@ -94,8 +93,6 @@ if "%__ARG%"=="-repl" (
9493
shift
9594
) else if "%__ARG%"=="-with-compiler" (
9695
set _WITH_COMPILER=1
97-
) else if "%__ARG%"=="-d" (
98-
set "_JAVA_DEBUG=%_DEBUG_STR%"
9996
) else if "%__ARG:~0,2%"=="-J" (
10097
set _JVM_OPTS=!_JVM_OPTS! %__ARG:~2%
10198
set _JAVA_OPTS=!_JAVA_OPTS! %__ARG%

0 commit comments

Comments
 (0)