diff options
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | common.mk | 5 | ||||
-rw-r--r-- | mjit.c | 17 | ||||
-rw-r--r-- | test/lib/jit_support.rb | 3 | ||||
-rw-r--r-- | win32/Makefile.sub | 1 |
5 files changed, 18 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 863e573baa..bd5ab6a120 100644 --- a/Makefile.in +++ b/Makefile.in @@ -589,6 +589,7 @@ mjit_config.h: echo '#define RUBY_MJIT_CONFIG_H 1'; \ echo; \ sep=; \ + quote MJIT_BUILD_DIR "$(dir $(realpath $(firstword $(MAKEFILE_LIST))))"; \ quote MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)"; \ sep=,; \ quote "MJIT_CC_COMMON " $(MJIT_CC); \ @@ -732,13 +732,10 @@ no-test-testframework: PHONY test-sample: test-basic # backward compatibility for mswin-build test: btest-ruby test-knownbug test-basic -INPLACE_TEST = $(LIBRUBY_RELATIVE:yes=) # $ 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 -# `make test-all` depends on `make install`: Since r62262, test_jit.rb fails if installed MJIT header is not updated -# and --enable-load-relative is not specified. We don't have solution for this yet. See also: https://bugs.ruby-lang.org/issues/13620 -yes-test-all: programs $(INPLACE_TEST:no=install) 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 @@ -1469,7 +1469,7 @@ init_header_filename(void) int fd; /* Root path of the running ruby process. Equal to RbConfig::TOPDIR. */ VALUE basedir_val; - char *basedir; + const char *basedir; size_t baselen; /* A name of the header file included in any C file generated by MJIT for iseqs. */ static const char header_name[] = MJIT_MIN_HEADER_NAME; @@ -1486,9 +1486,18 @@ init_header_filename(void) const size_t libpathflag_len = sizeof(libpathflag) - 1; #endif - basedir_val = ruby_prefix_path; - basedir = StringValuePtr(basedir_val); - baselen = RSTRING_LEN(basedir_val); + if (getenv("MJIT_SEARCH_BUILD_DIR")) { + /* This path is not intended to be used on production, but using build directory's + header file here because people want to run `make test-all` without running + `make install`. Don't use $MJIT_SEARCH_BUILD_DIR except for test-all. */ + basedir = MJIT_BUILD_DIR; + baselen = strlen(basedir); + } + else { + basedir_val = ruby_prefix_path; + basedir = StringValuePtr(basedir_val); + baselen = RSTRING_LEN(basedir_val); + } header_file = xmalloc(baselen + header_name_len + 1); p = append_str2(header_file, basedir, baselen); diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index 2ee1329e31..31f62c0a60 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -35,7 +35,8 @@ module JITSupport ] args << '--jit-save-temps' if save_temps args << '-e' << script - args.unshift(env) if env + base_env = { 'MJIT_SEARCH_BUILD_DIR' => 'true' } # workaround to skip requiring `make install` for `make test-all` + args.unshift(env ? base_env.merge!(env) : base_env) EnvUtil.invoke_ruby(args, '', true, true, timeout: timeout, ) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index becc6c2057..fff0e55d75 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1295,6 +1295,7 @@ mjit_config.h: #ifndef RUBY_MJIT_CONFIG_H #define RUBY_MJIT_CONFIG_H 1 +#define MJIT_BUILD_DIR "$(MAKEDIR)" #define MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)" <<KEEP @ |