|
From: <sv...@va...> - 2015-04-08 12:20:17
|
Author: florian
Date: Wed Apr 8 13:20:04 2015
New Revision: 15076
Log:
Consolidate shell script testcases without interpreter.
Added:
trunk/none/tests/scripts/shell_nointerp1
- copied, changed from r15075, trunk/none/tests/scripts/shell_valid2
trunk/none/tests/scripts/shell_nointerp1.stderr.exp
- copied unchanged from r15075, trunk/none/tests/scripts/shell_valid2.stderr.exp
trunk/none/tests/scripts/shell_nointerp1.vgtest
- copied, changed from r15075, trunk/none/tests/scripts/shell_valid2.vgtest
trunk/none/tests/scripts/shell_nointerp2 (with props)
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 (with props)
trunk/none/tests/scripts/shell_nointerp3.stderr.exp
trunk/none/tests/scripts/shell_nointerp3.stdout.exp
trunk/none/tests/scripts/shell_nointerp3.vgtest
Removed:
trunk/none/tests/scripts/shell_valid2
trunk/none/tests/scripts/shell_valid2.stderr.exp
trunk/none/tests/scripts/shell_valid2.vgtest
trunk/none/tests/scripts/shell_valid3
trunk/none/tests/scripts/shell_valid3.stderr.exp
trunk/none/tests/scripts/shell_valid3.vgtest
Modified:
trunk/none/tests/scripts/Makefile.am
trunk/none/tests/scripts/shell
trunk/none/tests/scripts/shell.stdout.exp
Modified: trunk/none/tests/scripts/Makefile.am
==============================================================================
--- trunk/none/tests/scripts/Makefile.am (original)
+++ trunk/none/tests/scripts/Makefile.am Wed Apr 8 13:20:04 2015
@@ -13,11 +13,15 @@
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 \
shell_nonexec.vgtest shell_nonexec.stderr.exp \
shell_nosuchfile.vgtest shell_nosuchfile.stderr.exp \
shell_valid1 shell_valid1.vgtest shell_valid1.stderr.exp \
- shell_valid2 shell_valid2.vgtest shell_valid2.stderr.exp \
- shell_valid3 shell_valid3.vgtest shell_valid3.stderr.exp \
shell_valid4 shell_valid4.vgtest shell_valid4.stderr.exp \
shell_valid4.stdout.exp \
shell_zerolength shell_zerolength.vgtest shell_zerolength.stderr.exp \
Modified: trunk/none/tests/scripts/shell
==============================================================================
--- trunk/none/tests/scripts/shell (original)
+++ trunk/none/tests/scripts/shell Wed Apr 8 13:20:04 2015
@@ -31,10 +31,10 @@
./shell_valid1
echo "Execute a valid script without a #! line"
-./shell_valid2
+./shell_nointerp1
echo "Execute a valid script with #! but no interpname"
-./shell_valid3
+./shell_nointerp2
echo "Execute a zero-length file"
./shell_zerolength
Modified: trunk/none/tests/scripts/shell.stdout.exp
==============================================================================
--- trunk/none/tests/scripts/shell.stdout.exp (original)
+++ trunk/none/tests/scripts/shell.stdout.exp Wed Apr 8 13:20:04 2015
@@ -6,5 +6,7 @@
Execute a non-existent file (2)
Execute a valid script with a #! line
Execute a valid script without a #! line
+tata
Execute a valid script with #! but no interpname
+no space after #!
Execute a zero-length file
Copied: trunk/none/tests/scripts/shell_nointerp1 (from r15075, trunk/none/tests/scripts/shell_valid2)
==============================================================================
--- trunk/none/tests/scripts/shell_valid2 (original)
+++ trunk/none/tests/scripts/shell_nointerp1 Wed Apr 8 13:20:04 2015
@@ -2,5 +2,5 @@
#
# This is a valid script without a #! line
-true
+echo tata
Copied: trunk/none/tests/scripts/shell_nointerp1.vgtest (from r15075, trunk/none/tests/scripts/shell_valid2.vgtest)
==============================================================================
--- trunk/none/tests/scripts/shell_valid2.vgtest (original)
+++ trunk/none/tests/scripts/shell_nointerp1.vgtest Wed Apr 8 13:20:04 2015
@@ -1,2 +1,2 @@
-prog: shell_valid2
+prog: shell_nointerp1
vgopts: -q
Added: trunk/none/tests/scripts/shell_nointerp2
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2 (added)
+++ trunk/none/tests/scripts/shell_nointerp2 Wed Apr 8 13:20:04 2015
@@ -0,0 +1,2 @@
+#!
+echo 'no space after #!'
Added: trunk/none/tests/scripts/shell_nointerp2.stderr.exp
==============================================================================
(empty)
Added: trunk/none/tests/scripts/shell_nointerp2.stdout.exp
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2.stdout.exp (added)
+++ trunk/none/tests/scripts/shell_nointerp2.stdout.exp Wed Apr 8 13:20:04 2015
@@ -0,0 +1 @@
+no space after #!
Added: trunk/none/tests/scripts/shell_nointerp2.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp2.vgtest (added)
+++ trunk/none/tests/scripts/shell_nointerp2.vgtest Wed Apr 8 13:20:04 2015
@@ -0,0 +1,2 @@
+prog: shell_nointerp2
+vgopts: -q
Added: trunk/none/tests/scripts/shell_nointerp3
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3 (added)
+++ trunk/none/tests/scripts/shell_nointerp3 Wed Apr 8 13:20:04 2015
@@ -0,0 +1,2 @@
+#!
+echo 'there is a space after the #!'
Added: trunk/none/tests/scripts/shell_nointerp3.stderr.exp
==============================================================================
(empty)
Added: trunk/none/tests/scripts/shell_nointerp3.stdout.exp
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3.stdout.exp (added)
+++ trunk/none/tests/scripts/shell_nointerp3.stdout.exp Wed Apr 8 13:20:04 2015
@@ -0,0 +1 @@
+there is a space after the #!
Added: trunk/none/tests/scripts/shell_nointerp3.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_nointerp3.vgtest (added)
+++ trunk/none/tests/scripts/shell_nointerp3.vgtest Wed Apr 8 13:20:04 2015
@@ -0,0 +1,2 @@
+prog: shell_nointerp3
+vgopts: -q
Removed: trunk/none/tests/scripts/shell_valid2
==============================================================================
--- trunk/none/tests/scripts/shell_valid2 (original)
+++ trunk/none/tests/scripts/shell_valid2 (removed)
@@ -1,6 +0,0 @@
-#
-#
-# This is a valid script without a #! line
-
-true
-
Removed: trunk/none/tests/scripts/shell_valid2.stderr.exp
==============================================================================
(empty)
Removed: trunk/none/tests/scripts/shell_valid2.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_valid2.vgtest (original)
+++ trunk/none/tests/scripts/shell_valid2.vgtest (removed)
@@ -1,2 +0,0 @@
-prog: shell_valid2
-vgopts: -q
Removed: trunk/none/tests/scripts/shell_valid3
==============================================================================
--- trunk/none/tests/scripts/shell_valid3 (original)
+++ trunk/none/tests/scripts/shell_valid3 (removed)
@@ -1,5 +0,0 @@
-#!
-#
-# The interpreter name is missing in this file.
-
-true
Removed: trunk/none/tests/scripts/shell_valid3.stderr.exp
==============================================================================
(empty)
Removed: trunk/none/tests/scripts/shell_valid3.vgtest
==============================================================================
--- trunk/none/tests/scripts/shell_valid3.vgtest (original)
+++ trunk/none/tests/scripts/shell_valid3.vgtest (removed)
@@ -1,2 +0,0 @@
-prog: shell_valid3
-vgopts: -q
|