From f7ce62cc5b2a7465add04fa2c49fb1068b3bb42b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 22 Dec 2024 23:14:03 +0900 Subject: [PATCH] Add `hello` --- .github/workflows/macos.yml | 12 +----------- .github/workflows/modgc.yml | 12 +----------- .github/workflows/ubuntu.yml | 12 +----------- common.mk | 10 +++++++++- 4 files changed, 12 insertions(+), 34 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 48990e4870..d0cdfc69af 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -105,17 +105,7 @@ jobs: - run: make - - run: | - make golf - case "${{ matrix.configure }}" in - *'--enable-shared'*) - make runnable - ./bin/goruby -veh - ;; - *) - ./goruby -veh - ;; - esac + - run: make hello - name: Set test options for skipped tests run: | diff --git a/.github/workflows/modgc.yml b/.github/workflows/modgc.yml index 2c0caa827a..266f7e0593 100644 --- a/.github/workflows/modgc.yml +++ b/.github/workflows/modgc.yml @@ -131,17 +131,7 @@ jobs: make install-modular-gc MODULAR_GC=${{ matrix.gc.name }} MMTK_BUILD=${{ matrix.gc.mmtk_build }} make distclean-modular-gc MODULAR_GC=${{ matrix.gc.name }} - - run: | - $SETARCH make golf - case "${{ matrix.configure }}" in - *'--enable-shared'*) - $SETARCH make runnable - ./bin/goruby -veh - ;; - *) - ./goruby -veh - ;; - esac + - run: $SETARCH make hello - name: Set test options for skipped tests run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 38c9e69745..2a77d03878 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -96,17 +96,7 @@ jobs: - run: $SETARCH make - - run: | - $SETARCH make golf - case "${{ matrix.configure }}" in - *'--enable-shared'*) - $SETARCH make runnable - ./bin/goruby -veh - ;; - *) - ./goruby -veh - ;; - esac + - run: $SETARCH make hello - name: Set test options for skipped tests run: | diff --git a/common.mk b/common.mk index 98fc6701a1..73312a6d87 100644 --- a/common.mk +++ b/common.mk @@ -1019,10 +1019,18 @@ no-test-spec: check: $(DOT_WAIT) test-spec RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable -runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY +runnable: $(RUNNABLE) +runnable-golf: golf +runnable $(enable_shared:yes=runnable-golf): prog $(tooldir)/mkrunnable.rb PHONY $(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT) yes-runnable: PHONY +hello: $(TEST_RUNNABLE)-hello +yes-hello: runnable-golf + ./$(enable_shared:yes=bin/)goruby -veh +no-hello: runnable-golf + $(ECHO) Run ./$(enable_shared:yes=bin/)goruby -veh + encs: enc trans libencs: libenc libtrans encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY