push sheeet

pkgs/test/make-binary-wrapper/add-flags/add-flags.c

@@ -0,0 +1,29 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+
+int main(int argc, char **argv) {
+    char **argv_tmp = calloc(9 + argc + 3 + 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] = "test var here";
+    argv_tmp[6] = "-g";
+    argv_tmp[7] = "*.txt";
+    argv_tmp[8] = "-a";
+    argv_tmp[9] = "*";
+    for (int i = 1; i < argc; ++i) {
+        argv_tmp[9 + i] = argv[i];
+    }
+    argv_tmp[9 + argc + 0] = "-foo";
+    argv_tmp[9 + argc + 1] = "-bar";
+    argv_tmp[9 + argc + 2] = "test var 2 here";
+    argv_tmp[9 + argc + 3] = NULL;
+    argv = argv_tmp;
+
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline

@@ -0,0 +1,7 @@
+    --append-flags "-foo -bar" \
+    --add-flags "-x -y -z" \
+    --add-flags -abc \
+    --add-flag 'test var here' \
+    --add-flags "-g *.txt" \
+    --add-flags "-a *" \
+    --append-flag 'test var 2 here'

pkgs/test/make-binary-wrapper/add-flags/add-flags.env

@@ -0,0 +1,14 @@
+CWD=SUBST_CWD
+SUBST_ARGV0
+-x
+-y
+-z
+-abc
+test var here
+-g
+*.txt
+-a
+*
+-foo
+-bar
+test var 2 here

pkgs/test/make-binary-wrapper/argv0/argv0.c

@@ -0,0 +1,7 @@
+#include <unistd.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv) {
+    argv[0] = "alternative-name";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/argv0/argv0.cmdline

@@ -0,0 +1 @@
+    --argv0 alternative-name

pkgs/test/make-binary-wrapper/argv0/argv0.env

@@ -0,0 +1,2 @@
+CWD=SUBST_CWD
+alternative-name

pkgs/test/make-binary-wrapper/basic/basic.c

@@ -0,0 +1,7 @@
+#include <unistd.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv) {
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/basic/basic.env

@@ -0,0 +1,2 @@
+CWD=SUBST_CWD
+SUBST_ARGV0

pkgs/test/make-binary-wrapper/chdir/chdir.c

@@ -0,0 +1,11 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
+
+int main(int argc, char **argv) {
+    assert_success(chdir("./tmp/foo"));
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/chdir/chdir.cmdline

@@ -0,0 +1 @@
+    --chdir ./tmp/foo

pkgs/test/make-binary-wrapper/chdir/chdir.env

@@ -0,0 +1,2 @@
+CWD=SUBST_CWD/tmp/foo
+SUBST_ARGV0

pkgs/test/make-binary-wrapper/combination/combination.c

@@ -0,0 +1,53 @@
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+
+#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
+
+void set_env_prefix(char *env, char *sep, char *prefix) {
+    char *existing = getenv(env);
+    if (existing) {
+        char *val;
+        assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing));
+        assert_success(setenv(env, val, 1));
+        free(val);
+    } else {
+        assert_success(setenv(env, prefix, 1));
+    }
+}
+
+void set_env_suffix(char *env, char *sep, char *suffix) {
+    char *existing = getenv(env);
+    if (existing) {
+        char *val;
+        assert_success(asprintf(&val, "%s%s%s", existing, sep, suffix));
+        assert_success(setenv(env, val, 1));
+        free(val);
+    } else {
+        assert_success(setenv(env, suffix, 1));
+    }
+}
+
+int main(int argc, char **argv) {
+    assert_success(setenv("MESSAGE", "HELLO", 0));
+    set_env_prefix("PATH", ":", "/usr/bin/");
+    set_env_suffix("PATH", ":", "/usr/local/bin/");
+    putenv("MESSAGE2=WORLD");
+
+    char **argv_tmp = calloc(3 + argc + 0 + 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";
+    for (int i = 1; i < argc; ++i) {
+        argv_tmp[3 + i] = argv[i];
+    }
+    argv_tmp[3 + argc + 0] = NULL;
+    argv = argv_tmp;
+
+    argv[0] = "my-wrapper";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/combination/combination.cmdline

@@ -0,0 +1,6 @@
+    --argv0 my-wrapper \
+    --set-default MESSAGE HELLO \
+    --prefix PATH : /usr/bin/ \
+    --suffix PATH : /usr/local/bin/ \
+    --add-flags "-x -y -z" \
+    --set MESSAGE2 WORLD

pkgs/test/make-binary-wrapper/combination/combination.env

@@ -0,0 +1,8 @@
+MESSAGE=HELLO
+PATH=/usr/bin/:/usr/local/bin/
+MESSAGE2=WORLD
+CWD=SUBST_CWD
+my-wrapper
+-x
+-y
+-z

pkgs/test/make-binary-wrapper/cross.nix

@@ -0,0 +1,30 @@
+{
+  stdenv,
+  runCommand,
+  makeBinaryWrapper,
+  binutils,
+  lib,
+  expectedArch ? stdenv.hostPlatform.parsed.cpu.name,
+}:
+
+runCommand "make-binary-wrapper-test-cross"
+  {
+    nativeBuildInputs = [
+      makeBinaryWrapper
+      binutils
+    ];
+    # For x86_64-linux the machine field is
+    # Advanced Micro Devices X86-64
+    # and uses a dash instead of a underscore unlike x86_64-linux in hostPlatform.parsed.cpu.name
+    expectedArch = lib.replaceStrings [ "_" ] [ "-" ] expectedArch;
+  }
+  ''
+    touch prog
+    chmod +x prog
+    makeWrapper prog $out
+    read -r _ arch < <($READELF --file-header $out | grep Machine:)
+    if [[ ''${arch,,} != *"''${expectedArch,,}"* ]]; then
+      echo "expected $expectedArch, got $arch"
+      exit 1
+    fi
+  ''

pkgs/test/make-binary-wrapper/default.nix

@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  pkgsCross,
+  makeBinaryWrapper,
+  writeText,
+  runCommand,
+  runCommandCC,
+}:
+
+let
+  env = {
+    nativeBuildInputs = [ makeBinaryWrapper ];
+  };
+  envCheck = runCommandCC "envcheck" env ''
+    cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c}
+  '';
+  makeGoldenTest =
+    testname:
+    runCommand "make-binary-wrapper-test-${testname}" env ''
+      mkdir -p tmp/foo # for the chdir test
+
+      source=${./. + "/${testname}"}
+
+      params=$(<"$source/${testname}.cmdline")
+      eval "makeCWrapper /send/me/flags $params" > wrapper.c
+
+      diff wrapper.c "$source/${testname}.c"
+
+      if [ -f "$source/${testname}.env" ]; then
+        eval "makeWrapper ${envCheck} wrapped $params"
+        env -i ./wrapped > env.txt
+        sed "s#SUBST_ARGV0#${envCheck}#;s#SUBST_CWD#$PWD#" \
+          "$source/${testname}.env" > golden-env.txt
+        if ! diff env.txt golden-env.txt; then
+          echo "env/argv should be:"
+          cat golden-env.txt
+          echo "env/argv output is:"
+          cat env.txt
+          exit 1
+        fi
+      else
+        # without a golden env, we expect the wrapper compilation to fail
+        ! eval "makeWrapper ${envCheck} wrapped $params" &> error.txt
+      fi
+
+      cp wrapper.c $out
+    '';
+  tests =
+    lib.genAttrs [
+      "add-flags"
+      "argv0"
+      "basic"
+      "chdir"
+      "combination"
+      "env"
+      "inherit-argv0"
+      "invalid-env"
+      "overlength-strings"
+      "prefix"
+      "suffix"
+    ] makeGoldenTest
+    // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+      cross =
+        pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.callPackage
+          ./cross.nix
+          { };
+    };
+in
+
+writeText "make-binary-wrapper-tests" ''
+  ${lib.concatStringsSep "\n" (builtins.attrValues tests)}
+''
+// tests

pkgs/test/make-binary-wrapper/env/env.c

@@ -0,0 +1,14 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
+
+int main(int argc, char **argv) {
+    putenv("PART1=HELLO");
+    assert_success(setenv("PART2", "WORLD", 0));
+    assert_success(unsetenv("SOME_OTHER_VARIABLE"));
+    putenv("PART3=\"!!\n\"");
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/env/env.cmdline

@@ -0,0 +1,4 @@
+    --set PART1 HELLO \
+    --set-default PART2 WORLD \
+    --unset SOME_OTHER_VARIABLE \
+    --set PART3 $'"!!\n"'

pkgs/test/make-binary-wrapper/env/env.env

@@ -0,0 +1,6 @@
+PART1=HELLO
+PART2=WORLD
+PART3="!!
+"
+CWD=SUBST_CWD
+SUBST_ARGV0

pkgs/test/make-binary-wrapper/envcheck.c

@@ -0,0 +1,22 @@
+#include <limits.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int main(int argc, char **argv, char **envp) {
+  for (char **env = envp; *env != 0; ++env) {
+    puts(*env);
+  }
+
+   char cwd[PATH_MAX];
+   if (getcwd(cwd, sizeof(cwd))) {
+     printf("CWD=%s\n", cwd);
+   } else {
+     perror("getcwd() error");
+     return 1;
+   }
+
+  for (int i=0; i < argc; ++i) {
+    puts(argv[i]);
+  }
+  return 0;
+}

pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c

@@ -0,0 +1,6 @@
+#include <unistd.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv) {
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline

@@ -0,0 +1 @@
+    --inherit-argv0

pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env

@@ -0,0 +1,2 @@
+CWD=SUBST_CWD
+./wrapped

pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c

@@ -0,0 +1,14 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
+
+int main(int argc, char **argv) {
+    putenv("==TEST1");
+    #error Illegal environment variable name `=` (cannot contain `=`)
+    assert_success(setenv("", "TEST2", 0));
+    #error Environment variable name can't be empty.
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline

@@ -0,0 +1,2 @@
+    --set "=" "TEST1" \
+    --set-default "" "TEST2"

pkgs/test/make-binary-wrapper/prefix/prefix.c

@@ -0,0 +1,26 @@
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+
+#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
+
+void set_env_prefix(char *env, char *sep, char *prefix) {
+    char *existing = getenv(env);
+    if (existing) {
+        char *val;
+        assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing));
+        assert_success(setenv(env, val, 1));
+        free(val);
+    } else {
+        assert_success(setenv(env, prefix, 1));
+    }
+}
+
+int main(int argc, char **argv) {
+    set_env_prefix("PATH", ":", "/usr/bin/");
+    set_env_prefix("PATH", ":", "/usr/local/bin/");
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/prefix/prefix.cmdline

@@ -0,0 +1,2 @@
+    --prefix PATH : /usr/bin/ \
+    --prefix PATH : /usr/local/bin/

pkgs/test/make-binary-wrapper/prefix/prefix.env

@@ -0,0 +1,3 @@
+PATH=/usr/local/bin/:/usr/bin/
+CWD=SUBST_CWD
+SUBST_ARGV0

pkgs/test/make-binary-wrapper/suffix/suffix.c

@@ -0,0 +1,26 @@
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+
+#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
+
+void set_env_suffix(char *env, char *sep, char *suffix) {
+    char *existing = getenv(env);
+    if (existing) {
+        char *val;
+        assert_success(asprintf(&val, "%s%s%s", existing, sep, suffix));
+        assert_success(setenv(env, val, 1));
+        free(val);
+    } else {
+        assert_success(setenv(env, suffix, 1));
+    }
+}
+
+int main(int argc, char **argv) {
+    set_env_suffix("PATH", ":", "/usr/bin/");
+    set_env_suffix("PATH", ":", "/usr/local/bin/");
+    argv[0] = "/send/me/flags";
+    return execv("/send/me/flags", argv);
+}

pkgs/test/make-binary-wrapper/suffix/suffix.cmdline

@@ -0,0 +1,2 @@
+    --suffix PATH : /usr/bin/ \
+    --suffix PATH : /usr/local/bin/

pkgs/test/make-binary-wrapper/suffix/suffix.env

@@ -0,0 +1,3 @@
+PATH=/usr/bin/:/usr/local/bin/
+CWD=SUBST_CWD
+SUBST_ARGV0