Add two more tests with missing interpreter names.
Consolidate 'nointerp' testcase file names.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15432 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/none/tests/scripts/Makefile.am b/none/tests/scripts/Makefile.am
index 8e4749d..62798dd 100644
--- a/none/tests/scripts/Makefile.am
+++ b/none/tests/scripts/Makefile.am
@@ -16,12 +16,11 @@
shell_badinterp shell_badinterp.vgtest shell_badinterp.stderr.exp \
shell_binaryfile shell_binaryfile.vgtest shell_binaryfile.stderr.exp \
shell_dir.vgtest shell_dir.stderr.exp \
- shell_nointerp1 shell_nointerp1.vgtest shell_nointerp1.stderr.exp \
- shell_nointerp1.stdout.exp \
- shell_nointerp2 shell_nointerp2.vgtest shell_nointerp2.stderr.exp \
- shell_nointerp2.stdout.exp \
- shell_nointerp3 shell_nointerp3.vgtest shell_nointerp3.stderr.exp \
- shell_nointerp3.stdout.exp \
+ nointerp1 nointerp1.vgtest nointerp1.stderr.exp nointerp1.stdout.exp \
+ nointerp2 nointerp2.vgtest nointerp2.stderr.exp nointerp2.stdout.exp \
+ nointerp3 nointerp3.vgtest nointerp3.stderr.exp nointerp3.stdout.exp \
+ nointerp4 nointerp4.vgtest nointerp4.stderr.exp \
+ nointerp5 nointerp5.vgtest nointerp5.stderr.exp \
shell_nonexec.vgtest shell_nonexec.stderr.exp \
shell_nosuchfile.vgtest shell_nosuchfile.stderr.exp \
relative1 relative1.vgtest relative1.stderr.exp relative1.stdout.exp \
diff --git a/none/tests/scripts/shell_nointerp1 b/none/tests/scripts/nointerp1
similarity index 100%
rename from none/tests/scripts/shell_nointerp1
rename to none/tests/scripts/nointerp1
diff --git a/none/tests/scripts/shell_nointerp1.stderr.exp b/none/tests/scripts/nointerp1.stderr.exp
similarity index 100%
rename from none/tests/scripts/shell_nointerp1.stderr.exp
rename to none/tests/scripts/nointerp1.stderr.exp
diff --git a/none/tests/scripts/shell_nointerp1.stdout.exp b/none/tests/scripts/nointerp1.stdout.exp
similarity index 100%
rename from none/tests/scripts/shell_nointerp1.stdout.exp
rename to none/tests/scripts/nointerp1.stdout.exp
diff --git a/none/tests/scripts/nointerp1.vgtest b/none/tests/scripts/nointerp1.vgtest
new file mode 100644
index 0000000..fdfbfa0
--- /dev/null
+++ b/none/tests/scripts/nointerp1.vgtest
@@ -0,0 +1,2 @@
+prog: nointerp1
+vgopts: -q
diff --git a/none/tests/scripts/shell_nointerp2 b/none/tests/scripts/nointerp2
similarity index 100%
rename from none/tests/scripts/shell_nointerp2
rename to none/tests/scripts/nointerp2
diff --git a/none/tests/scripts/shell_nointerp2.stderr.exp b/none/tests/scripts/nointerp2.stderr.exp
similarity index 100%
rename from none/tests/scripts/shell_nointerp2.stderr.exp
rename to none/tests/scripts/nointerp2.stderr.exp
diff --git a/none/tests/scripts/shell_nointerp2.stdout.exp b/none/tests/scripts/nointerp2.stdout.exp
similarity index 100%
rename from none/tests/scripts/shell_nointerp2.stdout.exp
rename to none/tests/scripts/nointerp2.stdout.exp
diff --git a/none/tests/scripts/nointerp2.vgtest b/none/tests/scripts/nointerp2.vgtest
new file mode 100644
index 0000000..104b182
--- /dev/null
+++ b/none/tests/scripts/nointerp2.vgtest
@@ -0,0 +1,2 @@
+prog: nointerp2
+vgopts: -q
diff --git a/none/tests/scripts/shell_nointerp3 b/none/tests/scripts/nointerp3
similarity index 100%
rename from none/tests/scripts/shell_nointerp3
rename to none/tests/scripts/nointerp3
diff --git a/none/tests/scripts/shell_nointerp3.stderr.exp b/none/tests/scripts/nointerp3.stderr.exp
similarity index 100%
rename from none/tests/scripts/shell_nointerp3.stderr.exp
rename to none/tests/scripts/nointerp3.stderr.exp
diff --git a/none/tests/scripts/shell_nointerp3.stdout.exp b/none/tests/scripts/nointerp3.stdout.exp
similarity index 100%
rename from none/tests/scripts/shell_nointerp3.stdout.exp
rename to none/tests/scripts/nointerp3.stdout.exp
diff --git a/none/tests/scripts/nointerp3.vgtest b/none/tests/scripts/nointerp3.vgtest
new file mode 100644
index 0000000..3a0cd3e
--- /dev/null
+++ b/none/tests/scripts/nointerp3.vgtest
@@ -0,0 +1,2 @@
+prog: nointerp3
+vgopts: -q
diff --git a/none/tests/scripts/nointerp4 b/none/tests/scripts/nointerp4
new file mode 100755
index 0000000..792d600
--- /dev/null
+++ b/none/tests/scripts/nointerp4
@@ -0,0 +1 @@
+#
diff --git a/none/tests/scripts/shell_nointerp1.stderr.exp b/none/tests/scripts/nointerp4.stderr.exp
similarity index 100%
copy from none/tests/scripts/shell_nointerp1.stderr.exp
copy to none/tests/scripts/nointerp4.stderr.exp
diff --git a/none/tests/scripts/nointerp4.vgtest b/none/tests/scripts/nointerp4.vgtest
new file mode 100755
index 0000000..9cb1be1
--- /dev/null
+++ b/none/tests/scripts/nointerp4.vgtest
@@ -0,0 +1,2 @@
+prog: nointerp4
+vgopts: -q
diff --git a/none/tests/scripts/nointerp5 b/none/tests/scripts/nointerp5
new file mode 100755
index 0000000..b1d2015
--- /dev/null
+++ b/none/tests/scripts/nointerp5
@@ -0,0 +1 @@
+#
diff --git a/none/tests/scripts/shell_nointerp1.stderr.exp b/none/tests/scripts/nointerp5.stderr.exp
similarity index 100%
copy from none/tests/scripts/shell_nointerp1.stderr.exp
copy to none/tests/scripts/nointerp5.stderr.exp
diff --git a/none/tests/scripts/nointerp5.vgtest b/none/tests/scripts/nointerp5.vgtest
new file mode 100755
index 0000000..63819ac
--- /dev/null
+++ b/none/tests/scripts/nointerp5.vgtest
@@ -0,0 +1,2 @@
+prog: nointerp5
+vgopts: -q
diff --git a/none/tests/scripts/shell b/none/tests/scripts/shell
index dc0b8b1..5df2ca2 100755
--- a/none/tests/scripts/shell
+++ b/none/tests/scripts/shell
@@ -31,10 +31,10 @@
./shell_valid1
echo "Execute a valid script without a #! line"
-./shell_nointerp1
+./nointerp1
echo "Execute a valid script with #! but no interpname"
-./shell_nointerp2
+./nointerp2
echo "Execute a zero-length file"
./shell_zerolength
diff --git a/none/tests/scripts/shell_nointerp1.vgtest b/none/tests/scripts/shell_nointerp1.vgtest
deleted file mode 100644
index 5a5c5c5..0000000
--- a/none/tests/scripts/shell_nointerp1.vgtest
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: shell_nointerp1
-vgopts: -q
diff --git a/none/tests/scripts/shell_nointerp2.vgtest b/none/tests/scripts/shell_nointerp2.vgtest
deleted file mode 100644
index 346e347..0000000
--- a/none/tests/scripts/shell_nointerp2.vgtest
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: shell_nointerp2
-vgopts: -q
diff --git a/none/tests/scripts/shell_nointerp3.vgtest b/none/tests/scripts/shell_nointerp3.vgtest
deleted file mode 100644
index 7ef940b..0000000
--- a/none/tests/scripts/shell_nointerp3.vgtest
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: shell_nointerp3
-vgopts: -q