(testsuite) mv fixture1 fixtures/shared/default

This commit is contained in:
Freddy Vulto 2010-02-05 15:16:19 +01:00
parent c70c1ecb31
commit dc4d28bc11
14 changed files with 19 additions and 20 deletions

View File

@ -3,7 +3,6 @@ AM_RUNTESTFLAGS = --outdir log
EXTRA_DIST = completion \ EXTRA_DIST = completion \
config \ config \
fixture1 \
fixtures \ fixtures \
lib \ lib \
unit unit

View File

@ -1,11 +1,11 @@
proc setup {} { proc setup {} {
save_env save_env
assert_bash_exec "touch fixture1/t.pdf"; # Create temporary files assert_bash_exec "touch fixtures/shared/default/t.pdf"; # Create temporary files
}; # setup() }; # setup()
proc teardown {} { proc teardown {} {
assert_bash_exec "rm fixture1/t.pdf"; # Remove temporary files assert_bash_exec "rm fixtures/shared/default/t.pdf"; # Remove temporary files
assert_env_unmodified assert_env_unmodified
}; # teardown() }; # teardown()
@ -13,7 +13,7 @@ proc teardown {} {
setup setup
assert_complete {"bar bar.d/" foo.d/ t.pdf} "acroread fixture1/" assert_complete {"bar bar.d/" foo.d/ t.pdf} "acroread fixtures/shared/default/"
sync_after_int sync_after_int

View File

@ -12,7 +12,7 @@ setup
# Adding a print job is successful? # Adding a print job is successful?
if {[assert_exec {lp -H hold fixture1/foo} job]} { if {[assert_exec {lp -H hold fixtures/shared/default/foo} job]} {
# Yes, adding a print-job is successful; # Yes, adding a print-job is successful;
# Retrieve job-id, so we can cancel the job after the test # Retrieve job-id, so we can cancel the job after the test
set job_id [lindex [split $job] 3] set job_id [lindex [split $job] 3]

View File

@ -12,7 +12,7 @@ setup
set test "Tab should complete" set test "Tab should complete"
assert_complete {"bar bar.d/" foo.d/} "cd fixture1/" $test assert_complete {"bar bar.d/" foo.d/} "cd fixtures/shared/default/" $test
sync_after_int sync_after_int
@ -20,13 +20,13 @@ sync_after_int
set test "Tab should complete cd at cursor position" set test "Tab should complete cd at cursor position"
# Try completion # Try completion
set cmd "cd fixture1/foo" set cmd "cd fixtures/shared/default/foo"
append cmd \002\002\002; # \002 = ^B = Move cursor left in bash emacs mode append cmd \002\002\002; # \002 = ^B = Move cursor left in bash emacs mode
#append cmd \033\0133D; # Escape-[-D = Cursor left #append cmd \033\0133D; # Escape-[-D = Cursor left
send "$cmd\t" send "$cmd\t"
expect { expect {
-re "cd fixture1/foo\b\b\b\r\n(\.svn/ +|)bar bar.d/ +foo.d/ *(\.svn/ *|)\r\n/@cd fixture1/foo\b\b\b$" { pass "$test" } -re "cd fixtures/shared/default/foo\b\b\b\r\n(\.svn/ +|)bar bar.d/ +foo.d/ *(\.svn/ *|)\r\n/@cd fixtures/shared/default/foo\b\b\b$" { pass "$test" }
-re "^cd fixture1/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" } -re "^cd fixtures/shared/default/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" }
-re /@ { unresolved "$test at prompt" } -re /@ { unresolved "$test at prompt" }
default { unresolved "$test" } default { unresolved "$test" }
}; # expect }; # expect
@ -38,7 +38,7 @@ sync_after_int
set test "Tab should complete CDPATH" set test "Tab should complete CDPATH"
# Set CDPATH # Set CDPATH
assert_bash_exec "CDPATH=\$PWD"; assert_bash_exec "CDPATH=\$PWD";
assert_complete "fixture1/foo.d/" "cd fixture1/fo" $test assert_complete "fixtures/shared/default/foo.d/" "cd fixtures/shared/default/fo" $test
sync_after_int sync_after_int
# Reset CDPATH # Reset CDPATH
assert_bash_exec "unset CDPATH" assert_bash_exec "unset CDPATH"

View File

@ -29,7 +29,7 @@ sync_after_int
set test "-wholename should complete files/dirs" set test "-wholename should complete files/dirs"
set dir fixture1 set dir fixtures/shared/default
set files [split [exec bash -c "cd $dir && ls -p"] "\n"] set files [split [exec bash -c "cd $dir && ls -p"] "\n"]
assert_complete_dir $files "find -wholename " $dir assert_complete_dir $files "find -wholename " $dir

View File

@ -18,7 +18,7 @@ sync_after_int
set test "Second argument should file complete" set test "Second argument should file complete"
set cmd "perl foo fixture1/f" set cmd "perl foo fixtures/shared/default/f"
send "$cmd\t" send "$cmd\t"
expect { expect {
-re "^$cmd\r\nfoo +foo.d/ *\r\n/@${cmd}oo$" { pass "$test" } -re "^$cmd\r\nfoo +foo.d/ *\r\n/@${cmd}oo$" { pass "$test" }
@ -31,7 +31,7 @@ sync_after_int
set test "-I without space should complete directories" set test "-I without space should complete directories"
set cmd "perl -Ifixture1/" set cmd "perl -Ifixtures/shared/default/"
send "$cmd\t" send "$cmd\t"
expect { expect {
-re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" } -re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" }
@ -44,7 +44,7 @@ sync_after_int
set test "-I with space should complete directories" set test "-I with space should complete directories"
set cmd "perl -I fixture1/" set cmd "perl -I fixtures/shared/default/"
send "$cmd\t" send "$cmd\t"
expect { expect {
-re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" } -re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" }
@ -57,7 +57,7 @@ sync_after_int
set test "-x without space should complete directories" set test "-x without space should complete directories"
set cmd "perl -xfixture1/b" set cmd "perl -xfixtures/shared/default/b"
send "$cmd\t" send "$cmd\t"
expect { expect {
-re "^${cmd}ar\\\\ bar.d/ *$" { pass "$test" } -re "^${cmd}ar\\\\ bar.d/ *$" { pass "$test" }
@ -70,7 +70,7 @@ sync_after_int
set test "-x with space should complete directories" set test "-x with space should complete directories"
set cmd "perl -x fixture1/b" set cmd "perl -x fixtures/shared/default/b"
send "$cmd\t" send "$cmd\t"
expect { expect {
-re "^${cmd}ar\\\\ bar.d/ *$" { pass "$test" } -re "^${cmd}ar\\\\ bar.d/ *$" { pass "$test" }

View File

@ -11,7 +11,7 @@ proc teardown {} {
setup setup
assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl-mt fixture1/" assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl-mt fixtures/shared/default/"
sync_after_int sync_after_int

View File

@ -11,7 +11,7 @@ proc teardown {} {
setup setup
assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl fixture1/" assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl fixtures/shared/default/"
sync_after_int sync_after_int

View File

@ -18,7 +18,7 @@ sync_after_int
set test "-c should complete files/dirs" set test "-c should complete files/dirs"
set dir fixture1 set dir fixtures/shared/default
set prompt "/$dir/@" set prompt "/$dir/@"
assert_bash_exec "cd $dir" "" $prompt assert_bash_exec "cd $dir" "" $prompt
set cmd "screen -c " set cmd "screen -c "

View File

@ -11,7 +11,7 @@ proc teardown {} {
setup setup
assert_complete "fixture1/foo.d/" "sudo cd fixture1/fo" assert_complete "fixtures/shared/default/foo.d/" "sudo cd fixtures/shared/default/fo"
sync_after_int sync_after_int