summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mk5
-rw-r--r--defs/gmake.mk2
2 files changed, 4 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index 9a6627db05..ead6e23b92 100644
--- a/common.mk
+++ b/common.mk
@@ -242,6 +242,7 @@ ext/extinit.c: $(srcdir)/template/extinit.c.tmpl
$(srcdir)/template/extinit.c.tmpl $(EXTINITS)
prog: program wprogram
+programs: $(PROGRAM) $(WPROGRAM)
$(PREP): $(MKFILES)
@@ -675,7 +676,7 @@ test: btest-ruby test-knownbug test-basic
# $ make test-all TESTOPTS="--help" displays more detail
# for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name"
test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog PHONY
+yes-test-all: programs PHONY
$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
TESTS_BUILD = mkmf
no-test-all: PHONY
@@ -712,7 +713,7 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
test-rubyspec: test-spec
yes-test-rubyspec: yes-test-spec
-test-spec-precheck: $(arch)-fake.rb
+test-spec-precheck: $(arch)-fake.rb programs
test-spec: $(TEST_RUNNABLE)-test-spec
yes-test-spec: test-spec-precheck
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 81d6575588..3b196f67bc 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -19,7 +19,7 @@ TEST_TARGETS := $(patsubst check,test test-testframework test-almost,$(patsubst
TEST_DEPENDS := $(filter-out check $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_TARGETS := $(patsubst test,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))
-TEST_DEPENDS += $(if $(filter-out btest%,$(TEST_TARGETS)),all exts)
+# TEST_DEPENDS += $(if $(filter-out btest%,$(TEST_TARGETS)),all exts)
ifneq ($(filter -O0 -Od,$(optflags)),)
override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))