diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-11-08 09:06:14 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-11-08 09:06:14 +0200 |
| commit | 1c94392a13cbdf87e03a644633eb775bf45694a1 (patch) | |
| tree | 74f11038dfc5f9d9db06660b1087253b28c5434f /tests | |
| parent | dd87bbb2b78b279248aaff15c0706fcd6d8cd7bb (diff) | |
| parent | 9d25ee30b188f9202cc14f7cd25ba8a1c3ec1a72 (diff) | |
| download | guix-1c94392a13cbdf87e03a644633eb775bf45694a1.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-build.sh | 10 | ||||
| -rw-r--r-- | tests/lint.scm | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 3d2de092b1..86e41e2927 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -77,6 +77,16 @@ module_dir="t-guix-build-$$" mkdir "$module_dir" trap "rm -rf $module_dir" EXIT +# Check error reporting for '-f'. +cat > "$module_dir/foo.scm" <<EOF +(use-modules (guix)) +) ;extra closing paren +EOF +! guix build -f "$module_dir/foo.scm" 2> "$module_dir/stderr" +grep "read error" "$module_dir/stderr" +rm "$module_dir/stderr" "$module_dir/foo.scm" + +# Check 'GUIX_PACKAGE_PATH' & co. cat > "$module_dir/foo.scm"<<EOF (define-module (foo) #:use-module (guix tests) diff --git a/tests/lint.scm b/tests/lint.scm index a2e9699d5a..e9663e69f9 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -107,7 +107,7 @@ "Texinfo markup in description is invalid" (single-lint-warning-message (check-description-style - (dummy-package "x" (description "f{oo}b@r"))))) + (dummy-package "x" (description (identity "f{oo}b@r")))))) (test-equal "description: does not start with an upper-case letter" "description should start with an upper-case letter or digit" @@ -209,7 +209,7 @@ "Texinfo markup in synopsis is invalid" (single-lint-warning-message (check-synopsis-style - (dummy-package "x" (synopsis "Bad $@ texinfo"))))) + (dummy-package "x" (synopsis (identity "Bad $@ texinfo")))))) (test-equal "synopsis: does not start with an upper-case letter" "synopsis should start with an upper-case letter or digit" |