Browse Source

guix {system,offload}: Improve reporting of syntax errors.

* guix/scripts/system.scm (read-operating-system) <catch handler>: Add
  case for 'syntax-error'.  Correct message for default case.
* guix/scripts/offload.scm (build-machines) <catch handler>: Add case
  for 'syntax-error'.
* tests/guix-system.sh: New file.
* Makefile.am (SH_TESTS): Add it.
gn-latest-20200428
Ludovic Courtès 7 years ago
parent
commit
c1202fb1f9
4 changed files with 53 additions and 1 deletions
  1. +1
    -0
      Makefile.am
  2. +4
    -0
      guix/scripts/offload.scm
  3. +5
    -1
      guix/scripts/system.scm
  4. +43
    -0
      tests/guix-system.sh

+ 1
- 0
Makefile.am View File

@ -154,6 +154,7 @@ SH_TESTS = \
tests/guix-gc.sh \
tests/guix-hash.sh \
tests/guix-package.sh \
tests/guix-system.sh \
tests/guix-archive.sh \
tests/guix-authenticate.sh


+ 4
- 0
guix/scripts/offload.scm View File

@ -121,6 +121,10 @@ determined."
'()
(leave (_ "failed to open machine file '~a': ~a~%")
file (strerror err)))))
(('syntax-error proc message properties form . rest)
(let ((loc (source-properties->location properties)))
(leave (_ "~a: ~a~%")
(location->string loc) message)))
(_
(leave (_ "failed to load machine file '~a': ~s~%")
file args))))))


+ 5
- 1
guix/scripts/system.scm View File

@ -66,8 +66,12 @@
(let ((err (system-error-errno args)))
(leave (_ "failed to open operating system file '~a': ~a~%")
file (strerror err))))
(('syntax-error proc message properties form . rest)
(let ((loc (source-properties->location properties)))
(leave (_ "~a: ~a~%")
(location->string loc) message)))
(_
(leave (_ "failed to load machine file '~a': ~s~%")
(leave (_ "failed to load operating system file '~a': ~s~%")
file args))))))
(define* (copy-closure store item target


+ 43
- 0
tests/guix-system.sh View File

@ -0,0 +1,43 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
# GNU Guix is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or (at
# your option) any later version.
#
# GNU Guix is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
#
# Test the daemon and its interaction with 'guix substitute-binary'.
#
set -e
guix system --version
tmpfile="t-guix-system-$$"
errorfile="t-guix-system-error-$$"
trap 'rm -f "$tmpfile" "$errorfile"' EXIT
cat > "$tmpfile"<<EOF
;; This is line 1, and the next one is line 2.
(operating-system)
;; The 'T' is at column 3.
EOF
if guix system vm "$tmpfile" 2> "$errorfile"
then
# This must not succeed.
exit 1
else
grep "$tmpfile:2:3:.*missing.* initializers" "$errorfile"
fi

Loading…
Cancel
Save