dos2unix in test script

Author: chenglou

analysis/Makefile

@@ -30,25 +30,13 @@ $(OUTPUT): $(SOURCE_FILES)
 build-native: $(OUTPUT) depend
 
 dce: build-native
-	@echo "git diff makefile dce 1"
-	git diff tests/src/expected/Auto.res.txt
 	../node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor
-	@echo "git diff makefile dce 2"
-	git diff tests/src/expected/Auto.res.txt
 
 tests/node_modules/.bin/rescript:
-	@echo "git diff makefile rescript 1"
-	git diff tests/src/expected/Auto.res.txt
 	@cd tests && npm install
-	@echo "git diff makefile rescript 2"
-	git diff tests/src/expected/Auto.res.txt
 
 test: dce tests/node_modules/.bin/rescript
-	@echo "git diff makefile test 1"
-	git diff tests/src/expected/Auto.res.txt
 	@cd tests && node_modules/.bin/rescript
-	@echo "git diff makefile test 2"
-	git diff tests/src/expected/Auto.res.txt
 	./test.sh
 
 clean:

analysis/test.sh

@@ -1,9 +1,6 @@
 function exp {
   echo "$(dirname $1)/expected/$(basename $1).txt"
 }
-function exp2 {
-  echo "$(dirname $1)/expected/$(basename $1).2.txt"
-}
 
 echo "cat -A test.sh"
 cat -A tests/src/expected/Auto.res.txt
@@ -12,27 +9,22 @@ echo "git diff test.sh"
 git diff tests/src/expected/Auto.res.txt
 echo "done---------"
 
-echo "doing an echo test"
-
-# node ./checkErrors.js
-
 for file in tests/src/*.{res,resi}; do
-  # ./rescript-editor-analysis.exe test $file &> $(exp $file)
-  cat $(exp $file) &> $(exp2 $file)
-  # CI
-  # if [ "$RUNNER_OS" == "Windows" ]; then
-  #   dos2unix $(exp $file)
-  # fi
+  ./rescript-editor-analysis.exe test $file &> $(exp $file)
 done
 
+# CI
+if [ "$RUNNER_OS" == "Windows" ]; then
+  dos2unix tests/src/expected/*
+fi
+
 echo "cat -A test.sh last"
-cat -A tests/src/expected/Auto.res.2.txt
+cat -A tests/src/expected/Auto.res.txt
 echo "done cat last---------"
 echo "git diff test.sh last"
 diff -u tests/src/expected/Auto.res.txt tests/src/expected/Auto.res.2.txt
 echo "done git last---------"
 
-
 warningYellow='\033[0;33m'
 successGreen='\033[0;32m'
 reset='\033[0m'
@@ -42,8 +34,6 @@ if [[ $diff = "" ]]; then
   printf "${successGreen}✅ No unstaged tests difference.${reset}\n"
 else
   printf "${warningYellow}⚠️ There are unstaged differences in tests/! Did you break a test?\n${diff}\n${reset}"
-  # node ./checkErrors.js
-
   git --no-pager diff --word-diff-regex=. tests/src/expected/Auto.res.txt
   exit 1
 fi