diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/gen_output.fish | 2 | ||||
-rwxr-xr-x | tests/test.fish | 2 | ||||
-rw-r--r-- | tests/test1.in | 10 | ||||
-rw-r--r-- | tests/test2.in | 2 | ||||
-rw-r--r-- | tests/test3.in | 6 | ||||
-rw-r--r-- | tests/test4.in | 12 |
6 files changed, 17 insertions, 17 deletions
diff --git a/tests/gen_output.fish b/tests/gen_output.fish index 91db67b0..49e15bfd 100755 --- a/tests/gen_output.fish +++ b/tests/gen_output.fish @@ -3,7 +3,7 @@ # # Generate output for a test script # -# It is important that you verify that the generated +# It is important that you verify that the generated # output is correct! # diff --git a/tests/test.fish b/tests/test.fish index 082db468..74e562b9 100755 --- a/tests/test.fish +++ b/tests/test.fish @@ -1,7 +1,7 @@ #!/usr/local/bin/fish # # Main loop of the test suite. I wrote this -# instad of using autotest to provide additional +# instad of using autotest to provide additional # testing for fish. :-) echo Testing high level script functionality diff --git a/tests/test1.in b/tests/test1.in index 5b87fb71..3b3ba25f 100644 --- a/tests/test1.in +++ b/tests/test1.in @@ -3,7 +3,7 @@ # for i in 1 2 #Comment on same line as command -#Comment inside loop +#Comment inside loop for j in a b #Double loop echo $i$j @@ -12,7 +12,7 @@ end # Simple alias tests -function foo +function foo echo >foo.txt $argv end @@ -26,16 +26,16 @@ else echo Test 2 fail end -function foo +function foo printf 'Test %s' $1; echo ' pass' end -foo 3 +foo 3 for i in Test for continue break and switch builtins problems; switch $i case Test - printf "%s " $i + printf "%s " $i case "f??" printf "%s " 3 case "c*" diff --git a/tests/test2.in b/tests/test2.in index a0c7ecbd..2a5ce81e 100644 --- a/tests/test2.in +++ b/tests/test2.in @@ -1,4 +1,4 @@ -#Tests complex parameter expantions +#Tests complex parameter expantions set a A set aa AA diff --git a/tests/test3.in b/tests/test3.in index 4b26d787..c6801999 100644 --- a/tests/test3.in +++ b/tests/test3.in @@ -62,9 +62,9 @@ end # Test that scope is preserved in double blocks -for i in 1 +for i in 1 set t6 $i - for j in a + for j in a if test $t6$j = 1a echo Test 6 pass else @@ -105,7 +105,7 @@ end # Test if exported variables go out of scope -if test (../fish -c "echo $t8") +if test (../fish -c "echo $t8") echo Test 9 fail else echo Test 9 pass diff --git a/tests/test4.in b/tests/test4.in index 0966694a..4155c0e8 100644 --- a/tests/test4.in +++ b/tests/test4.in @@ -2,30 +2,30 @@ set -e smurf -function setter +function setter set smurf green end -function unsetter +function unsetter set -e smurf end -function call1 +function call1 set smurf blue; setter; if test $smurf = blue; echo Test 1 pass; else; echo Test 1 fail; end end -function call2 +function call2 set smurf blue; unsetter; if test $smurf = blue; echo Test 2 pass; else; echo Test 2 fail; end end call1 call2 -function call3 +function call3 setter; if test $smurf = green; echo Test 3 pass; else; echo Test 3 fail; end end -function call4 +function call4 unsetter; if not set -q smurf; echo Test 4 pass; else; echo Test 4 fail; end end |