From e1cf40fa9537162efe0dc19dcea9ae7d043fde66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Feb 2014 16:34:24 +0100
Subject: nix-instantiate: Rename --eval-only to --eval, --parse-only to
 --parse

---
 tests/lang.sh | 10 +++++-----
 tests/misc.sh |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/lang.sh b/tests/lang.sh
index 0d93b9215c68..7324806522b7 100644
--- a/tests/lang.sh
+++ b/tests/lang.sh
@@ -7,7 +7,7 @@ fail=0
 for i in lang/parse-fail-*.nix; do
     echo "parsing $i (should fail)";
     i=$(basename $i .nix)
-    if nix-instantiate --parse-only - < lang/$i.nix; then
+    if nix-instantiate --parse - < lang/$i.nix; then
         echo "FAIL: $i shouldn't parse"
         fail=1
     fi
@@ -16,7 +16,7 @@ done
 for i in lang/parse-okay-*.nix; do
     echo "parsing $i (should succeed)";
     i=$(basename $i .nix)
-    if ! nix-instantiate --parse-only - < lang/$i.nix > lang/$i.out; then
+    if ! nix-instantiate --parse - < lang/$i.nix > lang/$i.out; then
         echo "FAIL: $i should parse"
         fail=1
     fi
@@ -25,7 +25,7 @@ done
 for i in lang/eval-fail-*.nix; do
     echo "evaluating $i (should fail)";
     i=$(basename $i .nix)
-    if nix-instantiate --eval-only lang/$i.nix; then
+    if nix-instantiate --eval lang/$i.nix; then
         echo "FAIL: $i shouldn't evaluate"
         fail=1
     fi
@@ -40,7 +40,7 @@ for i in lang/eval-okay-*.nix; do
         if test -e lang/$i.flags; then
             flags=$(cat lang/$i.flags)
         fi
-        if ! NIX_PATH=lang/dir3:lang/dir4_PATH nix-instantiate $flags --eval-only --strict lang/$i.nix > lang/$i.out; then
+        if ! NIX_PATH=lang/dir3:lang/dir4_PATH nix-instantiate $flags --eval --strict lang/$i.nix > lang/$i.out; then
             echo "FAIL: $i should evaluate"
             fail=1
         elif ! diff lang/$i.out lang/$i.exp; then
@@ -50,7 +50,7 @@ for i in lang/eval-okay-*.nix; do
     fi
     
     if test -e lang/$i.exp.xml; then
-        if ! nix-instantiate --eval-only --xml --no-location --strict \
+        if ! nix-instantiate --eval --xml --no-location --strict \
                 lang/$i.nix > lang/$i.out.xml; then
             echo "FAIL: $i should evaluate"
             fail=1
diff --git a/tests/misc.sh b/tests/misc.sh
index 42aa82c8d457..1b4d8f2cfc8e 100644
--- a/tests/misc.sh
+++ b/tests/misc.sh
@@ -5,7 +5,7 @@ source common.sh
 # Do all commands have help?
 #nix-env --help | grep -q install
 #nix-store --help | grep -q realise
-#nix-instantiate --help | grep -q eval-only
+#nix-instantiate --help | grep -q eval
 #nix-hash --help | grep -q base32
 
 # Can we ask for the version number?
-- 
cgit 1.4.1