dejagnu: fix target passing for 'runtest' wrapper#212688
Merged
trofi merged 1 commit intoNixOS:stagingfrom Jan 26, 2023
Merged
Conversation
The problem was initially noticed in https://sourceware.org/PR30052#c5 where 'runtest' was passing bogus target name when ran without parameters: $ ./result/bin/runtest ... Target is .runtest-wrapped Host is x86_64-pc-linux-gnu Note that runtest switches to non-native mode and uses wrapper name as a target name. Mechanics of it is a bit involved: 'runtest' itself detects targets passing via ${0} parameter: # somewhere in runtest: mypath=${0-.} ... if [ "$target" != runtest ] ; then target="--target ${target}" else target="" fi which would be fine if we ran 'runtest'. In `nixpkgs` `runtest` is a shell wrapper: $ cat /<<NIX>>/dejagnu-1.6.3/bin/runtest #! /<<NIX>>/bash-5.2-p15/bin/bash -e ... exec -a "$0" "/<<NIX>>/dejagnu-1.6.3/bin/.runtest-wrapped" "$@" You would expect that `.runtest-wrapped` would get `$0` as an `argv[0]` here, but no. If both are `bash` scripts `bash` peeks original `argv[0]` and breaks `runtest`: https://lists.gnu.org/archive/html/bug-bash/2023-01/msg00082.html The workaround here is to drop the wrapper and place `expect` symlink into a place where `dejagnu` and `runtest` expect it to be without a wrapper creation.
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.
The problem was initially noticed in https://sourceware.org/PR30052#c5 where 'runtest' was passing bogus target name when ran without parameters:
Note that runtest switches to non-native mode and uses wrapper name as a target name. Mechanics of it is a bit involved: 'runtest' itself detects targets passing via ${0} parameter:
which would be fine if we ran 'runtest'.
In
nixpkgsruntestis a shell wrapper:You would expect that
.runtest-wrappedwould get$0as anargv[0]here, but no. If both arebashscriptsbashpeeks originalargv[0]and breaksruntest:The workaround here is to drop the wrapper and place
expectsymlink into a place wheredejagnuandruntestexpect it to be without a wrapper creation.Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes