Merge pull request #13 from rakus/test-with-yash-shell

Also run tests with yash shell, if available
rakus · Oct 28, 2023 · 39468ff · 39468ff
2 parents 9636172 + d7d4b40
commit 39468ff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/deploy-doc.yaml b/.github/workflows/deploy-doc.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Build and deploy GH pages
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install cargo-get
       uses: baptiste0928/cargo-install@v2

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -83,7 +83,7 @@ jobs:
     - name: Install Shells (linux only)
       if: ${{ matrix.os=='linux' }}
       run: |
-        sudo apt-get install -y -qq ksh zsh
+        sudo apt-get install -y -qq ksh zsh yash
         sudo apt-get install -y mksh || true
 
     - name: Install Shells & Shellcheck (macos only)

diff --git a/.github/workflows/snapshot-release.yaml b/.github/workflows/snapshot-release.yaml
@@ -77,7 +77,7 @@ jobs:
     - name: Install Shells (linux only)
       if: ${{ matrix.os=='linux' }}
       run: |
-        sudo apt-get install -y -qq ksh zsh
+        sudo apt-get install -y -qq ksh zsh yash
         sudo apt-get install -y mksh || true
 
     - name: Install Shells & Shellcheck (macos only)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -38,7 +38,7 @@ jobs:
     - name: Install Shells (linux only)
       if: ${{ matrix.os=='linux' }}
       run: |
-        sudo apt-get install -y -qq ksh zsh
+        sudo apt-get install -y -qq ksh zsh yash
         sudo apt-get install -y mksh || true
 
     - name: Install Shells & Shellcheck (macos only)

diff --git a/script-test/run.sh b/script-test/run.sh
@@ -26,7 +26,7 @@ case "$(uname -s | tr '[:upper:]' '[:lower:]')" in
         ;;
 esac
 
-test_shells="bash ksh zsh pdksh mksh dash sh"
+test_shells="bash ksh zsh pdksh mksh yash dash sh"
 
 run_tests()
 {

diff --git a/script-test/test-invalid-utf8.sh b/script-test/test-invalid-utf8.sh
@@ -14,7 +14,12 @@ script_name="$(basename "$0")"
 
 start_test
 
-if [ -z "$IS_MSYS" ] && [ -z "$IS_CYGWIN" ]; then
+
+if [ -n "$IS_MSYS" ] || [ -n "$IS_CYGWIN" ]; then
+    echo "Skipped on Windows"
+elif [ "$TEST_SHELL" = "yash" ]; then
+    echo "Skipped with shell Yash, as it can't handle invalid UTF-8"
+else
 
     # The following should create some valid code on day
     test_pa_code 'exit 1' -o "n:name=name" -- "$(printf '\303\050')"
@@ -35,8 +40,6 @@ if [ -z "$IS_MSYS" ] && [ -z "$IS_CYGWIN" ]; then
     test_pa_code 'exit 1' -s "X$(printf '\303\050')Y" -o "n:name=name" --
     test_pa_code 'exit 1' -o "n:name=n$(printf '\303\050')ame" --
 
-else
-    echo "Skipped on Windows"
 fi
 
 end_test
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ case "$(uname -s | tr '[:upper:]' '[:lower:]')" in @@
             ;;
     esac
-    test_shells="bash ksh zsh pdksh mksh dash sh"
+    test_shells="bash ksh zsh pdksh mksh yash dash sh"
     run_tests()
     {
@@ Expand Down @@