[sanexx-commit] SF.net SVN: sanexx: [13]

[<pad...@us...>]

Revision: 13
Author:   paddy_hack
Date:     2006-03-12 01:23:48 -0800 (Sun, 12 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/sanexx/?rev=13&view=rev

Log Message:
-----------
 r28@qed:  olaf | 2006-03-12 14:45:14 +0900
 Added two very minor content checks for the help and version options.
 Marked the $actual and $expect variables as strings just in case they
 have spaces in them.  It prevents test failure caused by syntax error
 conditions in the test command.
 

Modified Paths:
--------------
    trunk/tests/frontend-cli-options

Property Changed:
----------------
    /

Property changes on: 
___________________________________________________________________
Name: svk:merge
   - 52428bda-890d-0410-88ad-be188b7e1831:/local:23
   + 52428bda-890d-0410-88ad-be188b7e1831:/local:28

Modified: trunk/tests/frontend-cli-options
===================================================================
--- trunk/tests/frontend-cli-options	2006-03-06 11:29:46 UTC (rev 12)
+++ trunk/tests/frontend-cli-options	2006-03-12 09:23:48 UTC (rev 13)
@@ -44,9 +44,18 @@
     list-devices
 
 
+sane_env scanimage++ --version > $test_prog.out 2>/dev/null
+actual=`grep -ie "no warranty" $test_prog.out`
+test x != x"$actual"
+
+sane_env scanimage++ --help > $test_prog.out 2>/dev/null
+actual=`grep -ie usage $test_prog.out`
+test x != x"$actual"
+
+
 sane_env scanimage++ --list-devices > $test_prog.out 2>/dev/null
 
 expect=`$AWK '/^number_of_devices/ {print $2}' \
 	${srcdir}/sane-conf/test.conf`
 actual=`$AWK 'BEGIN {t = 0} {++t} END {print t}' $test_prog.out`
-test x$expect = x$actual
+test x"$expect" = x"$actual"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.