From b63e0eb372b00d4cb5ca552ae9583bdb593f07dd Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 22:21:53 +0000 Subject: Revert "tests: move to _tests" This reverts commit 4d498aff1a147f06d71a8e96d17bbba9df5ae926. --- _tests/eval-test.nix | 15 --------------- _tests/eval-test.sh | 18 ------------------ tests/eval-test.nix | 15 +++++++++++++++ tests/eval-test.sh | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 _tests/eval-test.nix delete mode 100755 _tests/eval-test.sh create mode 100644 tests/eval-test.nix create mode 100755 tests/eval-test.sh diff --git a/_tests/eval-test.nix b/_tests/eval-test.nix deleted file mode 100644 index e946b0b..0000000 --- a/_tests/eval-test.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - imports = [ ]; - - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; - fsType = "btrfs"; - }; - - nixpkgs.config = { - allowBroken = true; - allowUnfree = true; - }; -} diff --git a/_tests/eval-test.sh b/_tests/eval-test.sh deleted file mode 100755 index 311208e..0000000 --- a/_tests/eval-test.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -cd $(dirname $0)/.. - -find=(find . -name default.nix) - -for profile in `${find[@]}`; do - echo evaluating $profile >&2 - - nixos-rebuild \ - -I nixos-config=_tests/eval-test.nix \ - -I nixos-hardware-profile=$profile \ - dry-build - - if [ $? -ne 0 ]; then - exit 1 - fi -done diff --git a/tests/eval-test.nix b/tests/eval-test.nix new file mode 100644 index 0000000..e946b0b --- /dev/null +++ b/tests/eval-test.nix @@ -0,0 +1,15 @@ +{ + imports = [ ]; + + boot.loader.systemd-boot.enable = true; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; + fsType = "btrfs"; + }; + + nixpkgs.config = { + allowBroken = true; + allowUnfree = true; + }; +} diff --git a/tests/eval-test.sh b/tests/eval-test.sh new file mode 100755 index 0000000..00970b7 --- /dev/null +++ b/tests/eval-test.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +cd $(dirname $0)/.. + +find=(find . -name default.nix) + +for profile in `${find[@]}`; do + echo evaluating $profile >&2 + + nixos-rebuild \ + -I nixos-config=tests/eval-test.nix \ + -I nixos-hardware-profile=$profile \ + dry-build + + if [ $? -ne 0 ]; then + exit 1 + fi +done -- cgit v1.2.3