Removed unnecessary --init-env option.

17 files changed, 21 insertions, 21 deletions

diff --git a/klee/test/Runtime/POSIX/DirConsistency.c b/klee/test/Runtime/POSIX/DirConsistency.c
index 613655e9c23..30696650102 100644
--- a/klee/test/Runtime/POSIX/DirConsistency.c
+++ b/klee/test/Runtime/POSIX/DirConsistency.c
@@ -1,7 +1,7 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --run-in=/tmp --use-random-search --init-env --libc=uclibc --posix-runtime --exit-on-error %t.bc --sym-files 1 1 > %t1.log
+// RUN: %klee --run-in=/tmp --use-random-search --libc=uclibc --posix-runtime --exit-on-error %t.bc --sym-files 1 1 > %t1.log
 // RUN: %llvmgcc -D_FILE_OFFSET_BITS=64 %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --run-in=/tmp --use-random-search --init-env --libc=uclibc --posix-runtime --exit-on-error %t.bc --sym-files 1 1 > %t2.log
+// RUN: %klee --run-in=/tmp --use-random-search --libc=uclibc --posix-runtime --exit-on-error %t.bc --sym-files 1 1 > %t2.log
 // RUN: sort %t1.log %t2.log | uniq -c > %t3.log
 // RUN: grep -q "4 COUNT" %t3.log
 
diff --git a/klee/test/Runtime/POSIX/DirSeek.c b/klee/test/Runtime/POSIX/DirSeek.c
index 1735fdb850c..81336a689ba 100644
--- a/klee/test/Runtime/POSIX/DirSeek.c
+++ b/klee/test/Runtime/POSIX/DirSeek.c
@@ -1,7 +1,7 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t2.bc
-// RUN: %klee --run-in=/tmp --init-env --libc=uclibc --posix-runtime --exit-on-error %t2.bc --sym-files 2 2
-// RUN: %klee --run-in=/tmp --init-env --libc=uclibc --posix-runtime --exit-on-error %t2.bc --sym-files 1 2
-// RUN: %klee --run-in=/tmp --init-env --libc=uclibc --posix-runtime --exit-on-error %t2.bc --sym-files 0 2
+// RUN: %klee --run-in=/tmp --libc=uclibc --posix-runtime --exit-on-error %t2.bc --sym-files 2 2
+// RUN: %klee --run-in=/tmp --libc=uclibc --posix-runtime --exit-on-error %t2.bc --sym-files 1 2
+// RUN: %klee --run-in=/tmp --libc=uclibc --posix-runtime --exit-on-error %t2.bc --sym-files 0 2
 
 // For this test really to work as intended it needs to be run in a
 // directory large enough to cause uclibc to do multiple getdents
diff --git a/klee/test/Runtime/POSIX/FDNumbers.c b/klee/test/Runtime/POSIX/FDNumbers.c
index e576f9bbe23..3228c8a9f2d 100644
--- a/klee/test/Runtime/POSIX/FDNumbers.c
+++ b/klee/test/Runtime/POSIX/FDNumbers.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t2.bc
-// RUN: %klee --init-env --posix-runtime --exit-on-error %t2.bc --sym-files 1 10
+// RUN: %klee --posix-runtime --exit-on-error %t2.bc --sym-files 1 10
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/klee/test/Runtime/POSIX/FD_Fail.c b/klee/test/Runtime/POSIX/FD_Fail.c
index cf1d4d5a758..a4bf2fc2222 100644
--- a/klee/test/Runtime/POSIX/FD_Fail.c
+++ b/klee/test/Runtime/POSIX/FD_Fail.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t1.bc
-// RUN: %klee --libc=uclibc --posix-runtime --init-env %t1.bc --sym-files 0 0 --max-fail 1 > %t.log
+// RUN: %klee --libc=uclibc --posix-runtime %t1.bc --sym-files 0 0 --max-fail 1 > %t.log
 // RUN: grep -q "fread(): ok" %t.log
 // RUN: grep -q "fread(): fail" %t.log
 // RUN: grep -q "fclose(): ok" %t.log
diff --git a/klee/test/Runtime/POSIX/FD_Fail2.c b/klee/test/Runtime/POSIX/FD_Fail2.c
index 1eaeb649186..062f7027006 100644
--- a/klee/test/Runtime/POSIX/FD_Fail2.c
+++ b/klee/test/Runtime/POSIX/FD_Fail2.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t1.bc
-// RUN: %klee --libc=uclibc --posix-runtime --init-env %t1.bc --sym-files 0 0 --max-fail 1
+// RUN: %klee --libc=uclibc --posix-runtime %t1.bc --sym-files 0 0 --max-fail 1
 // RUN: test -f klee-last/test000001.ktest
 // RUN: test -f klee-last/test000002.ktest
 // RUN: test -f klee-last/test000003.ktest
diff --git a/klee/test/Runtime/POSIX/Fcntl.c b/klee/test/Runtime/POSIX/Fcntl.c
index 139fb1f3ed1..1b37e711b1f 100644
--- a/klee/test/Runtime/POSIX/Fcntl.c
+++ b/klee/test/Runtime/POSIX/Fcntl.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t2.bc
-// RUN: %klee --init-env --posix-runtime --exit-on-error %t2.bc --sym-files 1 10
+// RUN: %klee --posix-runtime --exit-on-error %t2.bc --sym-files 1 10
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/klee/test/Runtime/POSIX/FilePerm.c b/klee/test/Runtime/POSIX/FilePerm.c
index 0cb0a7e8ee1..d387c2a961d 100644
--- a/klee/test/Runtime/POSIX/FilePerm.c
+++ b/klee/test/Runtime/POSIX/FilePerm.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --posix-runtime --init-env %t.bc --sym-files 1 10 --sym-stdout 2>%t.log 
+// RUN: %klee --posix-runtime %t.bc --sym-files 1 10 --sym-stdout 2>%t.log 
 // RUN: test -f klee-last/test000001.ktest
 // RUN: test -f klee-last/test000002.ktest
 // RUN: test -f klee-last/test000003.ktest
diff --git a/klee/test/Runtime/POSIX/FreeArgv.c b/klee/test/Runtime/POSIX/FreeArgv.c
index 37909b80a8b..ceec4de2d5e 100644
--- a/klee/test/Runtime/POSIX/FreeArgv.c
+++ b/klee/test/Runtime/POSIX/FreeArgv.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --init-env --posix-runtime %t.bc --sym-args 1 1 1
+// RUN: %klee --posix-runtime %t.bc --sym-args 1 1 1
 // RUN: test -f klee-last/test000001.free.err
 // RUN: test -f klee-last/test000002.free.err
 // RUN: test -f klee-last/test000003.free.err
diff --git a/klee/test/Runtime/POSIX/Getenv.c b/klee/test/Runtime/POSIX/Getenv.c
index 7ec667882de..9d5672f7dbf 100644
--- a/klee/test/Runtime/POSIX/Getenv.c
+++ b/klee/test/Runtime/POSIX/Getenv.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t2.bc
-// RUN: %klee --init-env --libc=klee --posix-runtime --exit-on-error %t2.bc --sym-files 1 10
+// RUN: %klee --libc=klee --posix-runtime --exit-on-error %t2.bc --sym-files 1 10
 
 #include <assert.h>
 
diff --git a/klee/test/Runtime/POSIX/Ioctl.c b/klee/test/Runtime/POSIX/Ioctl.c
index 0e7b2cad651..93ce4b5c784 100644
--- a/klee/test/Runtime/POSIX/Ioctl.c
+++ b/klee/test/Runtime/POSIX/Ioctl.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --init-env --posix-runtime --exit-on-error %t.bc --sym-files 0 4
+// RUN: %klee --posix-runtime --exit-on-error %t.bc --sym-files 0 4
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/klee/test/Runtime/POSIX/Isatty.c b/klee/test/Runtime/POSIX/Isatty.c
index 294312dc74c..4f8d142577a 100644
--- a/klee/test/Runtime/POSIX/Isatty.c
+++ b/klee/test/Runtime/POSIX/Isatty.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 0 10 --sym-stdout 2>%t.log
+// RUN: %klee --libc=uclibc --posix-runtime %t.bc --sym-files 0 10 --sym-stdout 2>%t.log
 
 // RUN: test -f klee-last/test000001.ktest
 // RUN: test -f klee-last/test000002.ktest
diff --git a/klee/test/Runtime/POSIX/PrgName.c b/klee/test/Runtime/POSIX/PrgName.c
index 5bed4335cdf..dc6a4b8c55c 100644
--- a/klee/test/Runtime/POSIX/PrgName.c
+++ b/klee/test/Runtime/POSIX/PrgName.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t2.bc
-// RUN: %klee --init-env --posix-runtime --exit-on-error %t2.bc --sym-arg 10 >%t.log
+// RUN: %klee --posix-runtime --exit-on-error %t2.bc --sym-arg 10 >%t.log
 // RUN: test -f klee-last/test000001.ktest
 // RUN: test -f klee-last/test000002.ktest
 // RUN: grep -q "No" %t.log
diff --git a/klee/test/Runtime/POSIX/Read1.c b/klee/test/Runtime/POSIX/Read1.c
index 3b24bfb9eee..66831073b6a 100644
--- a/klee/test/Runtime/POSIX/Read1.c
+++ b/klee/test/Runtime/POSIX/Read1.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --exit-on-error --posix-runtime --init-env %t.bc --sym-files 1 8 >%t.log
+// RUN: %klee --exit-on-error --posix-runtime %t.bc --sym-files 1 8 >%t.log
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/klee/test/Runtime/POSIX/SeedAndFail.c b/klee/test/Runtime/POSIX/SeedAndFail.c
index 4d81e2d78a9..db02217a42b 100644
--- a/klee/test/Runtime/POSIX/SeedAndFail.c
+++ b/klee/test/Runtime/POSIX/SeedAndFail.c
@@ -1,7 +1,7 @@
 // RUN: %llvmgcc %s -emit-llvm -g -O0 -c -o %t.bc
 // RUN: rm -rf tmp-123
-// RUN: %klee --libc=klee --output-dir=tmp-123 --posix-runtime --init-env %t.bc --sym-files 1 10  2>%t.log
-// RUN: %klee --seed-out-dir=tmp-123 --zero-seed-extension --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 1 10 --max-fail 1
+// RUN: %klee --libc=klee --output-dir=tmp-123 --posix-runtime %t.bc --sym-files 1 10  2>%t.log
+// RUN: %klee --seed-out-dir=tmp-123 --zero-seed-extension --libc=uclibc --posix-runtime %t.bc --sym-files 1 10 --max-fail 1
 // RUN: ls klee-last | grep -c assert | grep 4
 
 
diff --git a/klee/test/Runtime/POSIX/Stdin.c b/klee/test/Runtime/POSIX/Stdin.c
index 065533a1667..e7e3f2ff19d 100644
--- a/klee/test/Runtime/POSIX/Stdin.c
+++ b/klee/test/Runtime/POSIX/Stdin.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --init-env --libc=klee --posix-runtime --exit-on-error %t.bc --sym-files 0 4 > %t.log
+// RUN: %klee --libc=klee --posix-runtime --exit-on-error %t.bc --sym-files 0 4 > %t.log
 // RUN: grep "mode:file" %t.log
 // RUN: grep "mode:dir" %t.log
 // RUN: grep "mode:chr" %t.log
diff --git a/klee/test/Runtime/POSIX/Write1.c b/klee/test/Runtime/POSIX/Write1.c
index 73902363ccd..16132b8284f 100644
--- a/klee/test/Runtime/POSIX/Write1.c
+++ b/klee/test/Runtime/POSIX/Write1.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --exit-on-error --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 1 10 --sym-stdout 2>%t.log
+// RUN: %klee --exit-on-error --libc=uclibc --posix-runtime %t.bc --sym-files 1 10 --sym-stdout 2>%t.log
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/klee/test/Runtime/POSIX/Write2.c b/klee/test/Runtime/POSIX/Write2.c
index 4865b479e65..9801e70c6b4 100644
--- a/klee/test/Runtime/POSIX/Write2.c
+++ b/klee/test/Runtime/POSIX/Write2.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
-// RUN: %klee --exit-on-error --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 1 10 --sym-stdout 2>%t.log
+// RUN: %klee --exit-on-error --libc=uclibc --posix-runtime %t.bc --sym-files 1 10 --sym-stdout 2>%t.log
 
 #include <stdio.h>
 #include <assert.h>