diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-20 09:41:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-20 09:41:44 +0300 |
| commit | 6096abb0089146ef85e897ccf258289011c3a02a (patch) | |
| tree | a466861fb7632c994ba5a4dbb12ae0c40465bd94 /pkgs/test | |
| parent | 6f27ba80ea1125aa94dd1cc499dcf9a4d20a70a0 (diff) | |
| parent | df8b425f8990cf8c6cd8a4477a70995bdd4fe2a4 (diff) | |
| download | nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.tar nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.tar.gz nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.tar.bz2 nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.tar.lz nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.tar.xz nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.tar.zst nixpkgs-6096abb0089146ef85e897ccf258289011c3a02a.zip | |
Merge pull request #255208 from rhendric/rhendric/make-binary-wrapper
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/make-binary-wrapper/add-flags.c | 12 | ||||
| -rw-r--r-- | pkgs/test/make-binary-wrapper/add-flags.cmdline | 3 | ||||
| -rw-r--r-- | pkgs/test/make-binary-wrapper/add-flags.env | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/test/make-binary-wrapper/add-flags.c b/pkgs/test/make-binary-wrapper/add-flags.c index 3ae8678d442..d998a5f6f98 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.c +++ b/pkgs/test/make-binary-wrapper/add-flags.c @@ -3,19 +3,21 @@ #include <assert.h> int main(int argc, char **argv) { - char **argv_tmp = calloc(4 + argc + 2 + 1, sizeof(*argv_tmp)); + char **argv_tmp = calloc(6 + argc + 2 + 1, sizeof(*argv_tmp)); assert(argv_tmp != NULL); argv_tmp[0] = argv[0]; argv_tmp[1] = "-x"; argv_tmp[2] = "-y"; argv_tmp[3] = "-z"; argv_tmp[4] = "-abc"; + argv_tmp[5] = "-g"; + argv_tmp[6] = "*.txt"; for (int i = 1; i < argc; ++i) { - argv_tmp[4 + i] = argv[i]; + argv_tmp[6 + i] = argv[i]; } - argv_tmp[4 + argc + 0] = "-foo"; - argv_tmp[4 + argc + 1] = "-bar"; - argv_tmp[4 + argc + 2] = NULL; + argv_tmp[6 + argc + 0] = "-foo"; + argv_tmp[6 + argc + 1] = "-bar"; + argv_tmp[6 + argc + 2] = NULL; argv = argv_tmp; argv[0] = "/send/me/flags"; diff --git a/pkgs/test/make-binary-wrapper/add-flags.cmdline b/pkgs/test/make-binary-wrapper/add-flags.cmdline index f42d26f3adf..1ca964ab4e7 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.cmdline +++ b/pkgs/test/make-binary-wrapper/add-flags.cmdline @@ -1,3 +1,4 @@ --append-flags "-foo -bar" \ --add-flags "-x -y -z" \ - --add-flags -abc + --add-flags -abc \ + --add-flags "-g *.txt" diff --git a/pkgs/test/make-binary-wrapper/add-flags.env b/pkgs/test/make-binary-wrapper/add-flags.env index 3626b8cf97b..f0641ef36f7 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.env +++ b/pkgs/test/make-binary-wrapper/add-flags.env @@ -4,5 +4,7 @@ SUBST_ARGV0 -y -z -abc +-g +*.txt -foo -bar |