[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 53b1c41c160c3b112cbf6491f5c8840edd289e18

[Freddy Vulto]

The following commit has been merged in the master branch:
commit 285136a8dfb6c83652efe2f4c541c2f0866766c2
Author: Freddy Vulto <fvulto at gmail.com>
Date:   Fri Jul 24 11:20:38 2009 +0200

    Reviewed tests o*

diff --git a/test/_completion_to_review/objcopy.exp b/test/_completion_to_review/objcopy.exp
deleted file mode 100644
index ce7d043..0000000
--- a/test/_completion_to_review/objcopy.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/objcopy.exp"
diff --git a/test/_completion_to_review/objdump.exp b/test/_completion_to_review/objdump.exp
deleted file mode 100644
index 548b411..0000000
--- a/test/_completion_to_review/objdump.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/objdump.exp"
diff --git a/test/_completion_to_review/od.exp b/test/_completion_to_review/od.exp
deleted file mode 100644
index 51187ca..0000000
--- a/test/_completion_to_review/od.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/od.exp"
diff --git a/test/completion/objcopy.exp b/test/completion/objcopy.exp
new file mode 100644
index 0000000..1bfda5a
--- /dev/null
+++ b/test/completion/objcopy.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type objcopy]} {
+    source "lib/completions/objcopy.exp"
+}; # if
diff --git a/test/completion/objdump.exp b/test/completion/objdump.exp
new file mode 100644
index 0000000..b617b15
--- /dev/null
+++ b/test/completion/objdump.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type objdump]} {
+    source "lib/completions/objdump.exp"
+}; # if
diff --git a/test/completion/od.exp b/test/completion/od.exp
new file mode 100644
index 0000000..cb85411
--- /dev/null
+++ b/test/completion/od.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type od]} {
+    source "lib/completions/od.exp"
+}; # if
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/objcopy.exp
similarity index 82%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/objcopy.exp
index 26065d2..acb6539 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/objcopy.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "animate "
+assert_complete_any "objcopy "
 
 
 sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/objdump.exp
similarity index 82%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/objdump.exp
index 26065d2..5eec35d 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/objdump.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "animate "
+assert_complete_any "objdump "
 
 
 sync_after_int
diff --git a/test/lib/completions/ci.exp b/test/lib/completions/od.exp
similarity index 84%
copy from test/lib/completions/ci.exp
copy to test/lib/completions/od.exp
index 09105ee..5838218 100644
--- a/test/lib/completions/ci.exp
+++ b/test/lib/completions/od.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "ci "
+assert_complete_any "od "
 
 
 sync_after_int
diff --git a/test/lib/completions_to_review/openssl.exp b/test/lib/completions/openssl.exp
similarity index 100%
rename from test/lib/completions_to_review/openssl.exp
rename to test/lib/completions/openssl.exp
diff --git a/test/lib/completions_to_review/objcopy.exp b/test/lib/completions_to_review/objcopy.exp
deleted file mode 100644
index 733785c..0000000
--- a/test/lib/completions_to_review/objcopy.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "objcopy "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/objdump.exp b/test/lib/completions_to_review/objdump.exp
deleted file mode 100644
index faba38c..0000000
--- a/test/lib/completions_to_review/objdump.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "objdump "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/od.exp b/test/lib/completions_to_review/od.exp
deleted file mode 100644
index f117140..0000000
--- a/test/lib/completions_to_review/od.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "od "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

-- 
bash-completion