Repository navigation
Follow-ups to test job count computation - #914
Merged
Merged
Conversation
In a make recipe, $(cmd) is a make variable reference, not shell command substitution; it must be written $$(cmd). Outside a recipe, use $(shell cmd).
…define MPARG - Choose --jobs once at parse time (TEST_JOBS); a missing is-ci.sh means not under CI. - Evaluate JAVA_HOME once, and fail clearly on macOS if no JDK is found. - Use the same DAIKONDIR idiom in the kvasir-tests and dyncomp-tests Makefile.common. - Define MPARG in tests/dyncomp-tests/Makefile.
…tent DAIKONDIR * New tests/Makefile.jobs holds MPARG, DAIKONDIR, PLUME_SCRIPTS and TEST_JOBS for the three test-driver Makefiles. It fails clearly if is-ci.sh is missing, computes TEST_JOBS once and exports it, and honors a TEST_JOBS value from the command line or environment. * tests/Makefile.common sets JAVA_HOME before including Makefile.user, so the junit and junit5 Makefile.user files no longer duplicate the detection. Locate javac with a single shell command. Check for a missing JDK only when JAVA or JAVAC is expanded, so targets such as "clean" work without a JDK. * java/Makefile: compute JAVA_HOME once and fail clearly if no JDK is found. * Define DAIKONDIR with ":=" in the remaining test Makefiles; fix its depth in tests/daikon-tests/Makefile.
…do not set DAIKONDIR Computing the job count only when a recipe uses it lets targets such as clean and help work when plume-scripts is absent. An empty value is treated as unset. The variable is no longer exported.
…efile-shell-substitution
…ripts; use job count for dyncomp-tests
Member
Author
|
@coderabbitai review |
|
Member
Author
|
@coderabbitai review |
✅ Action performedReview finished.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #892.
DAIKON_TEST_JOBSclones plume-scripts if it is absent (unlessNONETWORKis set), as the top-level Makefile does, rather than failing. The clone goes to a temporary directory that is then renamed into place, so concurrent sub-makes do not collide and an interrupted clone does not leave a partial directory.clean-allin kvasir-tests and dyncomp-tests (and thusvery-clean) no longer requires plume-scripts.regression-testshonorsDAIKON_TEST_JOBSandMPARG, as kvasir-tests does.DAIKON_TEST_JOBS=1as the way to run serially.DAIKON_TEST_JOBS=1rather thanMPARG=-j1.