support integration tests requiring CARGO_BIN_EXE_<name>

crate2nix/Cargo.nix

@@ -3284,7 +3284,10 @@ rec {
           let
             drv = testCrate.override (_: {
               buildTests = true;
-            });
+            } // (lib.optionalAttrs (testCrate ? testedCrate) {
+              # if nixpkgs is recent enough to support testedCrate, provide it
+              testedCrate = testCrate;
+            }));
             # If the user hasn't set any pre/post commands, we don't want to
             # insert empty lines. This means that any existing users of crate2nix
             # don't get a spurious rebuild unless they set these explicitly.

crate2nix/templates/nix/crate2nix/default.nix

@@ -155,7 +155,10 @@ rec {
           let
             drv = testCrate.override (_: {
               buildTests = true;
-            });
+            } // (lib.optionalAttrs (testCrate ? testedCrate) {
+              # if nixpkgs is recent enough to support testedCrate, provide it
+              testedCrate = testCrate;
+            }));
             # If the user hasn't set any pre/post commands, we don't want to
             # insert empty lines. This means that any existing users of crate2nix
             # don't get a spurious rebuild unless they set these explicitly.

sample_projects/bin_with_git_submodule_dep/Cargo.nix

@@ -1502,7 +1502,10 @@ rec {
           let
             drv = testCrate.override (_: {
               buildTests = true;
-            });
+            } // (lib.optionalAttrs (testCrate ? testedCrate) {
+              # if nixpkgs is recent enough to support testedCrate, provide it
+              testedCrate = testCrate;
+            }));
             # If the user hasn't set any pre/post commands, we don't want to
             # insert empty lines. This means that any existing users of crate2nix
             # don't get a spurious rebuild unless they set these explicitly.

sample_projects/codegen/Cargo.nix

@@ -677,7 +677,10 @@ rec {
           let
             drv = testCrate.override (_: {
               buildTests = true;
-            });
+            } // (lib.optionalAttrs (testCrate ? testedCrate) {
+              # if nixpkgs is recent enough to support testedCrate, provide it
+              testedCrate = testCrate;
+            }));
             # If the user hasn't set any pre/post commands, we don't want to
             # insert empty lines. This means that any existing users of crate2nix
             # don't get a spurious rebuild unless they set these explicitly.

sample_projects/integration_test_with_envvar/Cargo.toml

@@ -0,0 +1,5 @@
+[package]
+name = "integration_test_with_envvar"
+version = "0.1.0"
+
+[dependencies]

sample_projects/integration_test_with_envvar/src/bin/exe-with-dash.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("exe-with-dash.rs");
+}

sample_projects/integration_test_with_envvar/src/bin/exe.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("exe.rs");
+}

sample_projects/integration_test_with_envvar/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("main.rs");
+}

sample_projects/integration_test_with_envvar/test.nix

@@ -0,0 +1,9 @@
+{ pkgs ? import ../../nix/nixpkgs.nix { config = { }; }
+, generatedCargoNix ? ./Cargo.nix { }
+}:
+let
+  instantiatedBuild = pkgs.callPackage generatedCargoNix { };
+in
+instantiatedBuild.rootCrate.build.override {
+  runTests = true;
+}

sample_projects/integration_test_with_envvar/tests/foo.rs

@@ -0,0 +1,15 @@
+#[test]
+fn test_main() {
+  let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_integration_test_with_envvar"));
+  assert_eq!(&cmd.output().unwrap().stdout, b"main.rs\n");
+}
+#[test]
+fn test_exe() {
+  let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_exe"));
+  assert_eq!(&cmd.output().unwrap().stdout, b"exe.rs\n");
+}
+#[test]
+fn test_exe2() {
+  let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_exe-with-dash"));
+  assert_eq!(&cmd.output().unwrap().stdout, b"exe-with-dash.rs\n");
+}

sample_projects/sub_dir_crates/Cargo.nix

@@ -286,7 +286,10 @@ rec {
           let
             drv = testCrate.override (_: {
               buildTests = true;
-            });
+            } // (lib.optionalAttrs (testCrate ? testedCrate) {
+              # if nixpkgs is recent enough to support testedCrate, provide it
+              testedCrate = testCrate;
+            }));
             # If the user hasn't set any pre/post commands, we don't want to
             # insert empty lines. This means that any existing users of crate2nix
             # don't get a spurious rebuild unless they set these explicitly.

tests.nix

@@ -377,6 +377,20 @@ let
       ];
     }
 
+    {
+      name = "integration_test_with_envvar";
+      src = ./sample_projects/integration_test_with_envvar;
+      cargoToml = "Cargo.toml";
+      customBuild = "sample_projects/integration_test_with_envvar/test.nix";
+      expectedOutput = "main.rs";
+      expectedTestOutputs = [
+        "test test_exe ... ok"
+        "test test_exe2 ... ok"
+        "test test_main ... ok"
+
+      ];
+    }
+
     {
       name = "cross_compile_build_dependencies";
       src = ./sample_projects/cross_compile_build_dependencies;