diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/builders.scm | 4 | ||||
| -rw-r--r-- | tests/guix-build.sh | 12 | ||||
| -rw-r--r-- | tests/guix-package.sh | 2 | ||||
| -rw-r--r-- | tests/packages.scm | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/builders.scm b/tests/builders.scm index 54cdeb6d7b..ce1f3852d7 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -46,14 +46,14 @@ (map (match-lambda ((name package) (list name (package-derivation %store package)))) - (@@ (gnu packages base) %boot0-inputs)))) + (@@ (gnu packages commencement) %boot0-inputs)))) (define %bootstrap-search-paths ;; Search path specifications that go with %BOOTSTRAP-INPUTS. (append-map (match-lambda ((name package _ ...) (package-native-search-paths package))) - (@@ (gnu packages base) %boot0-inputs))) + (@@ (gnu packages commencement) %boot0-inputs))) (define network-reachable? (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV))) diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 7c6594775a..27b3fdc39e 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -31,18 +31,18 @@ if guix build -e '(@ (gnu packages bootstrap) %bootstrap-glibc)' -S then false; else true; fi # Should pass. -guix build -e '(@@ (gnu packages base) %bootstrap-guile)' | \ +guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' | \ grep -e '-guile-' guix build hello -d | \ grep -e '-hello-[0-9\.]\+\.drv$' # Should all return valid log files. -drv="`guix build -d -e '(@@ (gnu packages base) %bootstrap-guile)'`" -out="`guix build -e '(@@ (gnu packages base) %bootstrap-guile)'`" +drv="`guix build -d -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'`" +out="`guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'`" log="`guix build --log-file $drv`" echo "$log" | grep log/.*guile.*drv test -f "$log" -test "`guix build -e '(@@ (gnu packages base) %bootstrap-guile)' --log-file`" \ +test "`guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' --log-file`" \ = "$log" test "`guix build --log-file guile-bootstrap`" = "$log" test "`guix build --log-file $out`" = "$log" @@ -53,11 +53,11 @@ if guix build hello-0.0.1 -n; then false; else true; fi # Keep a symlink to the result, registered as a root. result="t-result-$$" guix build -r "$result" \ - -e '(@@ (gnu packages base) %bootstrap-guile)' + -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' test -x "$result/bin/guile" # Should fail, because $result already exists. -if guix build -r "$result" -e '(@@ (gnu packages base) %bootstrap-guile)' +if guix build -r "$result" -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' then false; else true; fi rm -f "$result" diff --git a/tests/guix-package.sh b/tests/guix-package.sh index ce123105bf..580aa506b3 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -57,7 +57,7 @@ test "`guix package --search-paths -p "$profile" | wc -l`" = 0 # Check whether we have network access. if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null then - boot_make="(@@ (gnu packages base) gnu-make-boot0)" + boot_make="(@@ (gnu packages commencement) gnu-make-boot0)" boot_make_drv="`guix build -e "$boot_make" | grep -v -e -debug`" guix package --bootstrap -p "$profile" -i "$boot_make_drv" test -L "$profile-2-link" diff --git a/tests/packages.scm b/tests/packages.scm index 2a67f108ad..16e65619bc 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -339,7 +339,7 @@ (test-assert "GNU Make, bootstrap" ;; GNU Make is the first program built during bootstrap; we choose it ;; here so that the test doesn't last for too long. - (let ((gnu-make (@@ (gnu packages base) gnu-make-boot0))) + (let ((gnu-make (@@ (gnu packages commencement) gnu-make-boot0))) (and (package? gnu-make) (or (location? (package-location gnu-make)) (not (package-location gnu-make))) |