From 2f1586f6f204bdd040ba7a14633983568199dbc0 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 2 Apr 2023 17:50:22 +0900
Subject: Check leaked global symbols by default

---
 .cirrus.yml                       | 1 -
 .github/workflows/annocheck.yml   | 1 -
 .github/workflows/compilers.yml   | 1 -
 .github/workflows/macos.yml       | 2 --
 .github/workflows/mingw.yml       | 2 --
 .github/workflows/ubuntu.yml      | 2 --
 .github/workflows/yjit-ubuntu.yml | 2 --
 template/Makefile.in              | 2 +-
 8 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 20c14f375c..be76e4ab4a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -54,7 +54,6 @@ task:
   make_extract-extlibs_script: make extract-extlibs
   make_incs_script: make incs
   make_script: make
-  make_leaked-globals_script: make leaked-globals
   make_test_script: make test
   make_install_script: make install
   install_gems_for_test_script: $RUBY_PREFIX/bin/gem install --no-doc timezone tzinfo
diff --git a/.github/workflows/annocheck.yml b/.github/workflows/annocheck.yml
index 7715375e93..6d9b2fee3e 100644
--- a/.github/workflows/annocheck.yml
+++ b/.github/workflows/annocheck.yml
@@ -124,7 +124,6 @@ jobs:
       - run: make incs
       - run: make showflags
       - run: make
-      - run: make leaked-globals
       - run: make test
       - run: make install
         if: ${{ matrix.entry.check }}
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 10c95e74ef..625d614bb3 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -252,7 +252,6 @@ jobs:
       - run: make incs
       - run: make showflags
       - run: make
-      - run: make leaked-globals
       - run: make test
       - run: make install
         if: ${{ matrix.entry.check }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 06789586a1..e76908e500 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -77,8 +77,6 @@ jobs:
       - run: make prepare-gems
         if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make
-      - run: make leaked-globals
-        if: ${{ matrix.test_task == 'check' }}
       - name: make ${{ matrix.test_task }}
         run: |
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 4df18d63d9..5d26aebc62 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -127,8 +127,6 @@ jobs:
         run: |
           make
 
-      - run: make leaked-globals
-
       - name: make install
         run: |
           make DESTDIR=../install install-nodoc
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index f0ade0963a..36f5755083 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -101,8 +101,6 @@ jobs:
       - run: $SETARCH make prepare-gems
         if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: $SETARCH make
-      - run: $SETARCH make leaked-globals
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           $SETARCH ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index 6730f15e72..79c66ffd20 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -134,8 +134,6 @@ jobs:
       - run: make prepare-gems
         if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make -j
-      - run: make leaked-globals
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
diff --git a/template/Makefile.in b/template/Makefile.in
index 7b7fbd4c9e..d61f874a2d 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -636,6 +636,6 @@ un-runnable:
 	$(ECHO) cannot make runnable, configure with --enable-load-relative.
 	$(Q) exit 1
 
-# yes-test-basic: leaked-globals
+yes-test-basic: $(DOT_WAIT) leaked-globals
 leaked-globals: $(COMMONOBJS) prog $(tooldir)/leaked-globals PHONY
 	$(Q) $(XRUBY) $(tooldir)/leaked-globals NM="$(NM) -Pgp" SYMBOL_PREFIX=$(SYMBOL_PREFIX) PLATFORM=$(hdrdir)/ruby/$(PLATFORM_DIR).h $(srcdir)/configure.ac $(COMMONOBJS)
-- 
cgit v1.2.1