summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-18 22:37:38 -0600
committerWill Dietz <w@wdtz.org>2018-02-18 22:37:38 -0600
commit98215e10e044c29f44f88435e7503dc1657daa9a (patch)
tree9ee1100c7f378b51918ea372d582e7ee93e0d324
parenta78a1d61b56405aeaf04c173e4e3eebbc7cc52b8 (diff)
downloadnixlib-98215e10e044c29f44f88435e7503dc1657daa9a.tar
nixlib-98215e10e044c29f44f88435e7503dc1657daa9a.tar.gz
nixlib-98215e10e044c29f44f88435e7503dc1657daa9a.tar.bz2
nixlib-98215e10e044c29f44f88435e7503dc1657daa9a.tar.lz
nixlib-98215e10e044c29f44f88435e7503dc1657daa9a.tar.xz
nixlib-98215e10e044c29f44f88435e7503dc1657daa9a.tar.zst
nixlib-98215e10e044c29f44f88435e7503dc1657daa9a.zip
cc-wrapper tests: 4 and 5 regardless of default
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/release.nix8
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 911c13fbe29b..046db0c66cce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20650,6 +20650,8 @@ with pkgs;
     cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
     cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };
     cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; };
+    cc-wrapper-clang-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.stdenv; };
+    cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
     cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
     cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
     stdenv-inputs = callPackage ../test/stdenv-inputs { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5358738acb66..e7f8d3f2e4ca 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -112,6 +112,14 @@ let
               jobs.tests.cc-wrapper-clang-39.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-39.x86_64-linux
               jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-4.x86_64-linux
+              jobs.tests.cc-wrapper-clang-4.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-4.x86_64-linux
+              jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-5.x86_64-linux
+              jobs.tests.cc-wrapper-clang-5.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
+              jobs.tests.cc-wrapper-libcxx-5.x86_64-darwin
               jobs.tests.cc-multilib-gcc.x86_64-linux
               jobs.tests.cc-multilib-clang.x86_64-linux
               jobs.tests.stdenv-inputs.x86_64-linux