diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-03-31T12·38+0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-03-31T12·38+0000 |
| commit | 09381cccffe675ccbc8d183f043788f99dc018cd (patch) | |
| tree | 0c38ffd9438be5422dc871c75abd7b5b19ee11da /tests | |
| parent | 471419d1fac21412dea9a47eff200d44cd75d825 (diff) | |
Make source location info in the XML output optional.
* src/libexpr/expr-to-xml.cc (nix::showAttrs): Add `location' parameter. Provide location XML attributes when it's true. Update callers. (nix::printTermAsXML): Likewise. * src/libexpr/expr-to-xml.hh (nix::printTermAsXML): Update prototype; have `location' default to `false'. * src/nix-instantiate/nix-instantiate.cc (printResult, processExpr): Add `location' parameter; update callers. (run): Add support for `--no-location'. * src/nix-instantiate/help.txt: Update accordingly. * tests/lang.sh: Invoke `nix-instantiate' with `--no-location' for the XML tests. * tests/lang/eval-okay-toxml.exp, tests/lang/eval-okay-to-xml.nix: New files.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lang.sh | 3 | ||||
| -rw-r--r-- | tests/lang/eval-okay-toxml.exp | 1 | ||||
| -rw-r--r-- | tests/lang/eval-okay-toxml.nix | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/lang.sh b/tests/lang.sh index 18eb0278cfcc..54f01076371e 100644 --- a/tests/lang.sh +++ b/tests/lang.sh @@ -54,7 +54,8 @@ for i in lang/eval-okay-*.nix; do fi if test -e lang/$i.exp.xml; then - if ! $nixinstantiate --eval-only --xml --strict lang/$i.nix > lang/$i.out.xml; then + if ! $nixinstantiate --eval-only --xml --no-location --strict \ + lang/$i.nix > lang/$i.out.xml; then echo "FAIL: $i should evaluate" fail=1 elif ! cmp -s lang/$i.out.xml lang/$i.exp.xml; then diff --git a/tests/lang/eval-okay-toxml.exp b/tests/lang/eval-okay-toxml.exp new file mode 100644 index 000000000000..379f3c07617e --- /dev/null +++ b/tests/lang/eval-okay-toxml.exp @@ -0,0 +1 @@ +Str("<?xml version='1.0' encoding='utf-8'?>\n<expr>\n <attrs>\n <attr name=\"a\">\n <string value=\"s\" />\n </attr>\n </attrs>\n</expr>\n",[]) diff --git a/tests/lang/eval-okay-toxml.nix b/tests/lang/eval-okay-toxml.nix new file mode 100644 index 000000000000..068c97a6c1b3 --- /dev/null +++ b/tests/lang/eval-okay-toxml.nix @@ -0,0 +1,3 @@ +# Make sure the expected XML output is produced; in particular, make sure it +# doesn't contain source location information. +builtins.toXML { a = "s"; } |