From 548ba5b223b28370f1ebad51dd7ae298e4be1428 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue, 11 Dec 2012 11:01:59 -0800
Subject: Imply --exists when --atleast/exact/max-version passed

The --atleast/exact/max-version help description implied that it would
return as --exists does. However, this would only occur if no other
output options were set.

Freedesktop #54389 (https://bugs.freedesktop.org/show_bug.cgi?id=54389)
---
 check/check-print-options |  6 ++++++
 check/check-version       | 36 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'check')

diff --git a/check/check-print-options b/check/check-print-options
index 17aec1d..a2a41e7 100755
--- a/check/check-print-options
+++ b/check/check-print-options
@@ -52,3 +52,9 @@ RESULT="public-dep >= 1
 private-dep >= 1"
 run_test --print-requires --print-requires-private requires-test
 run_test --print-requires-private --print-requires requires-test
+
+# --exists and --atleast/exact/max-version can be mixed
+RESULT=""
+run_test --exists --atleast-version=1.0.0 simple
+run_test --exists --exact-version=1.0.0 simple
+run_test --exists --max-version=1.0.0 simple
diff --git a/check/check-version b/check/check-version
index f777ffc..e52cf4d 100755
--- a/check/check-version
+++ b/check/check-version
@@ -19,74 +19,74 @@ v3=1.0.1
 # exact version testing
 EXPECT_RETURN=1
 RESULT="Requested 'simple = $v1' but version of Simple test is $v2"
-run_test --exists --print-errors simple = $v1
+run_test --print-errors simple = $v1
 
 EXPECT_RETURN=1
 RESULT="Requested 'simple = $v1' but version of Simple test is $v2"
-run_test --exists --print-errors --exact-version=$v1 simple
+run_test --print-errors --exact-version=$v1 simple
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors simple = $v2
+run_test --print-errors simple = $v2
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors --exact-version=$v2 simple
+run_test --print-errors --exact-version=$v2 simple
 
 EXPECT_RETURN=1
 RESULT="Requested 'simple = $v3' but version of Simple test is $v2"
-run_test --exists --print-errors simple = $v3
+run_test --print-errors simple = $v3
 
 EXPECT_RETURN=1
 RESULT="Requested 'simple = $v3' but version of Simple test is $v2"
-run_test --exists --print-errors --exact-version=$v3 simple
+run_test --print-errors --exact-version=$v3 simple
 
 # atleast version testing
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors simple \>= $v1
+run_test --print-errors simple \>= $v1
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors --atleast-version=$v1 simple
+run_test --print-errors --atleast-version=$v1 simple
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors simple \>= $v2
+run_test --print-errors simple \>= $v2
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors --atleast-version=$v2 simple
+run_test --print-errors --atleast-version=$v2 simple
 
 EXPECT_RETURN=1
 RESULT="Requested 'simple >= $v3' but version of Simple test is $v2"
-run_test --exists --print-errors simple \>= $v3
+run_test --print-errors simple \>= $v3
 
 EXPECT_RETURN=1
 RESULT="Requested 'simple >= $v3' but version of Simple test is $v2"
-run_test --exists --print-errors --atleast-version=$v3 simple
+run_test --print-errors --atleast-version=$v3 simple
 
 # max version testing
 EXPECT_RETURN=1
 RESULT="Requested 'simple <= $v1' but version of Simple test is $v2"
-run_test --exists --print-errors simple \<= $v1
+run_test --print-errors simple \<= $v1
 
 EXPECT_RETURN=1
 RESULT="Requested 'simple <= $v1' but version of Simple test is $v2"
-run_test --exists --print-errors --max-version=$v1 simple
+run_test --print-errors --max-version=$v1 simple
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors simple \<= $v2
+run_test --print-errors simple \<= $v2
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors --max-version=$v2 simple
+run_test --print-errors --max-version=$v2 simple
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors simple \<= $v3
+run_test --print-errors simple \<= $v3
 
 EXPECT_RETURN=0
 RESULT=""
-run_test --exists --print-errors --max-version=$v3 simple
+run_test --print-errors --max-version=$v3 simple
-- 
cgit v1.2.1