[Ltrace-devel] r54 - in ltrace/trunk: . testsuite/lib testsuite/ltrace.minor

[Ian Wienand]

Author: ianw-guest
Date: 2006-08-07 02:10:22 +0000 (Mon, 07 Aug 2006)
New Revision: 54

Modified:
   ltrace/trunk/ChangeLog
   ltrace/trunk/testsuite/lib/ltrace.exp
   ltrace/trunk/testsuite/ltrace.minor/count-record.exp
Log:
rejig testcase grepping


Modified: ltrace/trunk/ChangeLog
===================================================================
--- ltrace/trunk/ChangeLog	2006-08-07 02:06:16 UTC (rev 53)
+++ ltrace/trunk/ChangeLog	2006-08-07 02:10:22 UTC (rev 54)
@@ -1,3 +1,8 @@
+2006-07-20  Steve Fink <sphink at gmail.com>
+
+	* testsuite/lib/ltrace.exp: better quoting and error detection for
+	ltrace_verify_output's call to grep
+
 2006-08-07  Steve Fink  <sphink at gmail.com>
 
 	* ltrace.1: update bug email addr

Modified: ltrace/trunk/testsuite/lib/ltrace.exp
===================================================================
--- ltrace/trunk/testsuite/lib/ltrace.exp	2006-08-07 02:06:16 UTC (rev 53)
+++ ltrace/trunk/testsuite/lib/ltrace.exp	2006-08-07 02:10:22 UTC (rev 54)
@@ -260,10 +260,12 @@
 proc ltrace_verify_output { file_to_search pattern {instance_no 0}} {
 
 	# compute the number of PATTERN in FILE_TO_SEARCH by grep and wc.
-	catch "exec sh -c {grep $pattern $file_to_search | wc -l ;exit}" output
+	catch "exec sh -c {grep \"$pattern\" $file_to_search | wc -l ;exit}" output
 	verbose "output = $output"
-	
-	if { $instance_no == 0 } then {
+
+	if [ regexp "syntax error" $output ] then {
+		fail "Invalid regular expression $pattern"
+        } elseif { $instance_no == 0 } then {
 		if { $output == 0 } then {
 			fail "Fail to find $pattern in $file_to_search"
 		} else {

Modified: ltrace/trunk/testsuite/ltrace.minor/count-record.exp
===================================================================
--- ltrace/trunk/testsuite/ltrace.minor/count-record.exp	2006-08-07 02:06:16 UTC (rev 53)
+++ ltrace/trunk/testsuite/ltrace.minor/count-record.exp	2006-08-07 02:10:22 UTC (rev 54)
@@ -48,30 +48,30 @@
 #   3.39    0.000268         268         1 fread
 #
 
-set pattern "\'1 rmdir\'"
+set pattern " 1 rmdir"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 fopen\'"
+set pattern " 1 fopen"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'2 remove\'"
+set pattern " 2 remove"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 mkdir\'"
+set pattern " 1 mkdir"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 fseek\'"
+set pattern " 1 fseek"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 fwrite\'"
+set pattern " 1 fwrite"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 fclose\'"
+set pattern " 1 fclose"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 rename\'"
+set pattern " 1 rename"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 symlink\'"
+set pattern " 1 symlink"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 chdir\'"
+set pattern " 1 chdir"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 access\'"
+set pattern " 1 access"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 getcwd\'"
+set pattern " 1 getcwd"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern "\'1 fread\'"
+set pattern " 1 fread"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern