From ae8d5586ee0bc2993d702123369026a550cb4a51 Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Tue, 6 Feb 2024 14:32:57 -0500
Subject: [PATCH] Add test-all to prism

---
 .github/workflows/prism.yml              | 30 ++++++++----------------
 test/.excludes-prism/TestAssignment.rb   |  1 +
 test/.excludes-prism/TestM17N.rb         |  5 ++++
 test/.excludes-prism/TestRequire.rb      |  1 +
 test/.excludes-prism/TestRubyLiteral.rb  |  1 +
 test/.excludes-prism/TestSetTraceFunc.rb |  3 +++
 test/.excludes-prism/TestSyntax.rb       |  1 +
 7 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 test/.excludes-prism/TestAssignment.rb
 create mode 100644 test/.excludes-prism/TestM17N.rb
 create mode 100644 test/.excludes-prism/TestRequire.rb
 create mode 100644 test/.excludes-prism/TestRubyLiteral.rb
 create mode 100644 test/.excludes-prism/TestSetTraceFunc.rb
 create mode 100644 test/.excludes-prism/TestSyntax.rb

diff --git a/.github/workflows/prism.yml b/.github/workflows/prism.yml
index d8fbb8ee830eb0..151fd2c4966d3a 100644
--- a/.github/workflows/prism.yml
+++ b/.github/workflows/prism.yml
@@ -83,33 +83,23 @@ jobs:
 
       - run: $SETARCH make
 
-      - name: make btest
+      - name: make test
         run: |
-          make -s btest RUN_OPTS="$RUN_OPTS"
+          $SETARCH make -s test RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 30
         env:
           GNUMAKEFLAGS: ''
           RUBY_TESTOPTS: '-v --tty=no'
           RUN_OPTS: ${{ matrix.run_opts }}
-        continue-on-error: true
 
-      # - name: make test
-      #   run: |
-      #     $SETARCH make -s test RUN_OPTS="$RUN_OPTS"
-      #   timeout-minutes: 30
-      #   env:
-      #     GNUMAKEFLAGS: ''
-      #     RUBY_TESTOPTS: '-v --tty=no'
-      #     RUN_OPTS: ${{ matrix.run_opts }}
-
-      # - name: make test-all
-      #   run: |
-      #     $SETARCH make -s test-all RUN_OPTS="$RUN_OPTS"
-      #   timeout-minutes: 40
-      #   env:
-      #     GNUMAKEFLAGS: ''
-      #     RUBY_TESTOPTS: '-q --tty=no'
-      #     RUN_OPTS: ${{ matrix.run_opts }}
+      - name: make test-all
+        run: |
+          $SETARCH make -s test-all RUN_OPTS="$RUN_OPTS"
+        timeout-minutes: 40
+        env:
+          GNUMAKEFLAGS: ''
+          RUBY_TESTOPTS: '-q --tty=no --excludes-dir="../src/test/.excludes-prism" --exclude="test_ast.rb" --exclude="test_regexp.rb" --exclude="error_highlight/test_error_highlight.rb"'
+          RUN_OPTS: ${{ matrix.run_opts }}
 
       # - name: make test-spec
       #   run: |
diff --git a/test/.excludes-prism/TestAssignment.rb b/test/.excludes-prism/TestAssignment.rb
new file mode 100644
index 00000000000000..23a1b4c5e77e5f
--- /dev/null
+++ b/test/.excludes-prism/TestAssignment.rb
@@ -0,0 +1 @@
+exclude(:test_massign_order, "https://github.com/ruby/prism/issues/2370")
diff --git a/test/.excludes-prism/TestM17N.rb b/test/.excludes-prism/TestM17N.rb
new file mode 100644
index 00000000000000..c49125bd1f6891
--- /dev/null
+++ b/test/.excludes-prism/TestM17N.rb
@@ -0,0 +1,5 @@
+exclude(:test_regexp_embed, "https://github.com/ruby/prism/issues/1997")
+exclude(:test_dynamic_eucjp_regexp, "https://github.com/ruby/prism/issues/1997")
+exclude(:test_regexp_ascii, "https://github.com/ruby/prism/issues/1997")
+exclude(:test_dynamic_utf8_regexp, "https://github.com/ruby/prism/issues/1997")
+exclude(:test_dynamic_sjis_regexp, "https://github.com/ruby/prism/issues/1997")
diff --git a/test/.excludes-prism/TestRequire.rb b/test/.excludes-prism/TestRequire.rb
new file mode 100644
index 00000000000000..78997a42b75bab
--- /dev/null
+++ b/test/.excludes-prism/TestRequire.rb
@@ -0,0 +1 @@
+exclude(:test_require_nonascii_path_shift_jis, "unknown")
diff --git a/test/.excludes-prism/TestRubyLiteral.rb b/test/.excludes-prism/TestRubyLiteral.rb
new file mode 100644
index 00000000000000..0ea7c9362cb3e8
--- /dev/null
+++ b/test/.excludes-prism/TestRubyLiteral.rb
@@ -0,0 +1 @@
+exclude(:test_string, "https://github.com/ruby/prism/issues/2331")
diff --git a/test/.excludes-prism/TestSetTraceFunc.rb b/test/.excludes-prism/TestSetTraceFunc.rb
new file mode 100644
index 00000000000000..61f51de1be355c
--- /dev/null
+++ b/test/.excludes-prism/TestSetTraceFunc.rb
@@ -0,0 +1,3 @@
+exclude(:test_tracepoint_nested_enabled_with_target, "unknown")
+exclude(:test_allow_reentry, "unknown")
+exclude(:test_tp_rescue, "unknown"
diff --git a/test/.excludes-prism/TestSyntax.rb b/test/.excludes-prism/TestSyntax.rb
new file mode 100644
index 00000000000000..bfc9ff9d9e7a98
--- /dev/null
+++ b/test/.excludes-prism/TestSyntax.rb
@@ -0,0 +1 @@
+exclude(:test_it, "https://github.com/ruby/prism/issues/2323")