From f615d17cb6c354c7dbb5678618fc1a22e3cab24f Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Thu, 16 Jul 2009 22:51:18 +0200
Subject: [PATCH] tsuite) Only test completions if installed Some tests failed
 with label `failed', which is incorrect because the completions just weren't
 installed.  Completions weren't installed because the commands to complete
 weren't installed. Fixed so that if commands aren't available, the tests fail
 with label `unsupported'.

---
 test/completion/change_pw.exp    | 4 +++-
 test/completion/check_db.exp     | 4 +++-
 test/completion/check_perms.exp  | 4 +++-
 test/completion/civclient.exp    | 4 +++-
 test/completion/civserver.exp    | 4 +++-
 test/completion/cksfv.exp        | 4 +++-
 test/completion/cleanarch.exp    | 4 +++-
 test/completion/clone_member.exp | 4 +++-
 test/completion/config_list.exp  | 4 +++-
 9 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/test/completion/change_pw.exp b/test/completion/change_pw.exp
index c1a996b3..2a1334c5 100644
--- a/test/completion/change_pw.exp
+++ b/test/completion/change_pw.exp
@@ -1 +1,3 @@
-source "lib/completions/change_pw.exp"
+if {[assert_bash_type {change_pw}]} {
+    source "lib/completions/change_pw.exp"
+}; # if
diff --git a/test/completion/check_db.exp b/test/completion/check_db.exp
index 19bc9fc6..09fddb29 100644
--- a/test/completion/check_db.exp
+++ b/test/completion/check_db.exp
@@ -1 +1,3 @@
-source "lib/completions/check_db.exp"
+if {[assert_bash_type {check_db}]} {
+    source "lib/completions/check_db.exp"
+}; # if
diff --git a/test/completion/check_perms.exp b/test/completion/check_perms.exp
index e664246c..a7b9d2d3 100644
--- a/test/completion/check_perms.exp
+++ b/test/completion/check_perms.exp
@@ -1 +1,3 @@
-source "lib/completions/check_perms.exp"
+if {[assert_bash_type {check_perms}]} {
+    source "lib/completions/check_perms.exp"
+}; # if
diff --git a/test/completion/civclient.exp b/test/completion/civclient.exp
index 933ec8ef..45eeb3f2 100644
--- a/test/completion/civclient.exp
+++ b/test/completion/civclient.exp
@@ -1 +1,3 @@
-source "lib/completions/civclient.exp"
+if {[assert_bash_type {civclient}]} {
+    source "lib/completions/civclient.exp"
+}; # if
diff --git a/test/completion/civserver.exp b/test/completion/civserver.exp
index a3eb4a5c..f16419fd 100644
--- a/test/completion/civserver.exp
+++ b/test/completion/civserver.exp
@@ -1 +1,3 @@
-source "lib/completions/civserver.exp"
+if {[assert_bash_type {civserver}]} {
+    source "lib/completions/civserver.exp"
+}; # if
diff --git a/test/completion/cksfv.exp b/test/completion/cksfv.exp
index 12e398ee..b7fc9088 100644
--- a/test/completion/cksfv.exp
+++ b/test/completion/cksfv.exp
@@ -1 +1,3 @@
-source "lib/completions/cksfv.exp"
+if {[assert_bash_type {cksfv}]} {
+    source "lib/completions/cksfv.exp"
+}; # if
diff --git a/test/completion/cleanarch.exp b/test/completion/cleanarch.exp
index e7efa8bc..925ab607 100644
--- a/test/completion/cleanarch.exp
+++ b/test/completion/cleanarch.exp
@@ -1 +1,3 @@
-source "lib/completions/cleanarch.exp"
+if {[assert_bash_type {cleanarch}]} {
+    source "lib/completions/cleanarch.exp"
+}; # if
diff --git a/test/completion/clone_member.exp b/test/completion/clone_member.exp
index f2c7fa00..f8d10fa9 100644
--- a/test/completion/clone_member.exp
+++ b/test/completion/clone_member.exp
@@ -1 +1,3 @@
-source "lib/completions/clone_member.exp"
+if {[assert_bash_type {clone_member}]} {
+    source "lib/completions/clone_member.exp"
+}; # if
diff --git a/test/completion/config_list.exp b/test/completion/config_list.exp
index d014f572..749e7faa 100644
--- a/test/completion/config_list.exp
+++ b/test/completion/config_list.exp
@@ -1 +1,3 @@
-source "lib/completions/config_list.exp"
+if {[assert_bash_type {config_list}]} {
+    source "lib/completions/config_list.exp"
+}; # if