|
From: <sv...@va...> - 2015-07-21 22:05:15
|
Author: florian
Date: Tue Jul 21 23:05:07 2015
New Revision: 15432
Log:
Add two more tests with missing interpreter names.
Consolidate 'nointerp' testcase file names.
Added:
trunk/none/tests/scripts/nointerp1
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp1
trunk/none/tests/scripts/nointerp1.stderr.exp
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp1.stderr.exp
trunk/none/tests/scripts/nointerp1.stdout.exp
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp1.stdout.exp
trunk/none/tests/scripts/nointerp1.vgtest
- copied, changed from r15430, trunk/none/tests/scripts/shell_nointerp1.vgtest
trunk/none/tests/scripts/nointerp2
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp2
trunk/none/tests/scripts/nointerp2.stderr.exp
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp2.stderr.exp
trunk/none/tests/scripts/nointerp2.stdout.exp
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp2.stdout.exp
trunk/none/tests/scripts/nointerp2.vgtest
- copied, changed from r15430, trunk/none/tests/scripts/shell_nointerp2.vgtest
trunk/none/tests/scripts/nointerp3
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp3
trunk/none/tests/scripts/nointerp3.stderr.exp
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp3.stderr.exp
trunk/none/tests/scripts/nointerp3.stdout.exp
- copied unchanged from r15430, trunk/none/tests/scripts/shell_nointerp3.stdout.exp
trunk/none/tests/scripts/nointerp3.vgtest
- copied, changed from r15430, trunk/none/tests/scripts/shell_nointerp3.vgtest
trunk/none/tests/scripts/nointerp4 (with props)
trunk/none/tests/scripts/nointerp4.stderr.exp
trunk/none/tests/scripts/nointerp4.vgtest (with props)
trunk/none/tests/scripts/nointerp5 (with props)
trunk/none/tests/scripts/nointerp5.stderr.exp
trunk/none/tests/scripts/nointerp5.vgtest (with props)
Removed:
trunk/none/tests/scripts/shell_nointerp1
trunk/none/tests/scripts/shell_nointerp1.stderr.exp
trunk/none/tests/scripts/shell_nointerp1.stdout.exp
trunk/none/tests/scripts/shell_nointerp1.vgtest
trunk/none/tests/scripts/shell_nointerp2
trunk/none/tests/scripts/shell_nointerp2.stderr.exp
trunk/none/tests/scripts/shell_nointerp2.stdout.exp
trunk/none/tests/scripts/shell_nointerp2.vgtest
trunk/none/tests/scripts/shell_nointerp3
trunk/none/tests/scripts/shell_nointerp3.stderr.exp
trunk/none/tests/scripts/shell_nointerp3.stdout.exp
trunk/none/tests/scripts/shell_nointerp3.vgtest
Modified:
trunk/none/tests/scripts/Makefile.am
trunk/none/tests/scripts/shell
Modified: trunk/none/tests/scripts/Makefile.am
==============================================================================
--- trunk/none/tests/scripts/Makefile.am (original)
+++ trunk/none/tests/scripts/Makefile.am Tue Jul 21 23:05:07 2015
@@ -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 \
Copied: trunk/none/tests/scripts/nointerp1.vgtest (from r15430, trunk/none/tests/scripts/shell_nointerp1.vgtest)
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp1.vgtest (original)
+++ trunk/none/tests/scripts/nointerp1.vgtest Tue Jul 21 23:05:07 2015
@@ -1,2 +1,2 @@
-prog: shell_nointerp1
+prog: nointerp1
vgopts: -q
Copied: trunk/none/tests/scripts/nointerp2.vgtest (from r15430, trunk/none/tests/scripts/shell_nointerp2.vgtest)
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2.vgtest (original)
+++ trunk/none/tests/scripts/nointerp2.vgtest Tue Jul 21 23:05:07 2015
@@ -1,2 +1,2 @@
-prog: shell_nointerp2
+prog: nointerp2
vgopts: -q
Copied: trunk/none/tests/scripts/nointerp3.vgtest (from r15430, trunk/none/tests/scripts/shell_nointerp3.vgtest)
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3.vgtest (original)
+++ trunk/none/tests/scripts/nointerp3.vgtest Tue Jul 21 23:05:07 2015
@@ -1,2 +1,2 @@
-prog: shell_nointerp3
+prog: nointerp3
vgopts: -q
Added: trunk/none/tests/scripts/nointerp4
==============================================================================
--- trunk/none/tests/scripts/nointerp4 (added)
+++ trunk/none/tests/scripts/nointerp4 Tue Jul 21 23:05:07 2015
@@ -0,0 +1 @@
+#
Added: trunk/none/tests/scripts/nointerp4.stderr.exp
==============================================================================
(empty)
Added: trunk/none/tests/scripts/nointerp4.vgtest
==============================================================================
--- trunk/none/tests/scripts/nointerp4.vgtest (added)
+++ trunk/none/tests/scripts/nointerp4.vgtest Tue Jul 21 23:05:07 2015
@@ -0,0 +1,2 @@
+prog: nointerp4
+vgopts: -q
Added: trunk/none/tests/scripts/nointerp5
==============================================================================
--- trunk/none/tests/scripts/nointerp5 (added)
+++ trunk/none/tests/scripts/nointerp5 Tue Jul 21 23:05:07 2015
@@ -0,0 +1 @@
+#
Added: trunk/none/tests/scripts/nointerp5.stderr.exp
==============================================================================
(empty)
Added: trunk/none/tests/scripts/nointerp5.vgtest
==============================================================================
--- trunk/none/tests/scripts/nointerp5.vgtest (added)
+++ trunk/none/tests/scripts/nointerp5.vgtest Tue Jul 21 23:05:07 2015
@@ -0,0 +1,2 @@
+prog: nointerp5
+vgopts: -q
Modified: trunk/none/tests/scripts/shell
==============================================================================
--- trunk/none/tests/scripts/shell (original)
+++ trunk/none/tests/scripts/shell Tue Jul 21 23:05:07 2015
@@ -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
Removed: trunk/none/tests/scripts/shell_nointerp1
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp1 (original)
+++ trunk/none/tests/scripts/shell_nointerp1 (removed)
@@ -1,6 +0,0 @@
-#
-#
-# This is a valid script without a #! line
-
-echo tata
-
Removed: trunk/none/tests/scripts/shell_nointerp1.stderr.exp
==============================================================================
(empty)
Removed: trunk/none/tests/scripts/shell_nointerp1.stdout.exp
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp1.stdout.exp (original)
+++ trunk/none/tests/scripts/shell_nointerp1.stdout.exp (removed)
@@ -1 +0,0 @@
-tata
Removed: trunk/none/tests/scripts/shell_nointerp1.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp1.vgtest (original)
+++ trunk/none/tests/scripts/shell_nointerp1.vgtest (removed)
@@ -1,2 +0,0 @@
-prog: shell_nointerp1
-vgopts: -q
Removed: trunk/none/tests/scripts/shell_nointerp2
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2 (original)
+++ trunk/none/tests/scripts/shell_nointerp2 (removed)
@@ -1,2 +0,0 @@
-#!
-echo 'no space after #!'
Removed: trunk/none/tests/scripts/shell_nointerp2.stderr.exp
==============================================================================
(empty)
Removed: trunk/none/tests/scripts/shell_nointerp2.stdout.exp
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2.stdout.exp (original)
+++ trunk/none/tests/scripts/shell_nointerp2.stdout.exp (removed)
@@ -1 +0,0 @@
-no space after #!
Removed: trunk/none/tests/scripts/shell_nointerp2.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2.vgtest (original)
+++ trunk/none/tests/scripts/shell_nointerp2.vgtest (removed)
@@ -1,2 +0,0 @@
-prog: shell_nointerp2
-vgopts: -q
Removed: trunk/none/tests/scripts/shell_nointerp3
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3 (original)
+++ trunk/none/tests/scripts/shell_nointerp3 (removed)
@@ -1,2 +0,0 @@
-#!
-echo 'there is a space after the #!'
Removed: trunk/none/tests/scripts/shell_nointerp3.stderr.exp
==============================================================================
(empty)
Removed: trunk/none/tests/scripts/shell_nointerp3.stdout.exp
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3.stdout.exp (original)
+++ trunk/none/tests/scripts/shell_nointerp3.stdout.exp (removed)
@@ -1 +0,0 @@
-there is a space after the #!
Removed: trunk/none/tests/scripts/shell_nointerp3.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3.vgtest (original)
+++ trunk/none/tests/scripts/shell_nointerp3.vgtest (removed)
@@ -1,2 +0,0 @@
-prog: shell_nointerp3
-vgopts: -q
|