* adjust line numbers of expected output

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@491 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/tests/test_log_output.sh b/tests/test_log_output.sh
index d96b860099c9794f0ec8a618deaa9c9d6ef618a3..a75c0f468691b24616bd13d95b470a1a916d8da3 100755 (executable)
--- a/tests/test_log_output.sh
+++ b/tests/test_log_output.sh
@@ -7,11 +7,11 @@ else
 fi
 
 expected="Running suite S1
-${lsrc}ex_log_output.c:8:P:Core:test_pass:0: Passed
-${lsrc}ex_log_output.c:14:F:Core:test_fail:0: Failure
-${lsrc}ex_log_output.c:18:E:Core:test_exit:0: (after this point) Early exit with return value 1
+${lsrc}ex_log_output.c:10:P:Core:test_pass:0: Passed
+${lsrc}ex_log_output.c:16:F:Core:test_fail:0: Failure
+${lsrc}ex_log_output.c:20:E:Core:test_exit:0: (after this point) Early exit with return value 1
 Running suite S2
-${lsrc}ex_log_output.c:26:P:Core:test_pass2:0: Passed
+${lsrc}ex_log_output.c:28:P:Core:test_pass2:0: Passed
 Results for all suites run:
 50%: Checks: 4, Failures: 1, Errors: 1"
 

diff --git a/tests/test_output.sh b/tests/test_output.sh
index f6f93f5f2ea53a357f93278347df28e3fd4c3977..f1042183c81ab9bb557bc8266950df306d79241f 100755 (executable)
--- a/tests/test_output.sh
+++ b/tests/test_output.sh
@@ -11,13 +11,13 @@ t1="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1"
 t2="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1
-${lsrc}ex_output.c:14:F:Core:test_fail:0: Failure
-${lsrc}ex_output.c:18:E:Core:test_exit:0: (after this point) Early exit with return value 1"
+${lsrc}ex_output.c:16:F:Core:test_fail:0: Failure
+${lsrc}ex_output.c:20:E:Core:test_exit:0: (after this point) Early exit with return value 1"
 t3="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1
-${lsrc}ex_output.c:8:P:Core:test_pass:0: Passed
-${lsrc}ex_output.c:14:F:Core:test_fail:0: Failure
-${lsrc}ex_output.c:18:E:Core:test_exit:0: (after this point) Early exit with return value 1"
+${lsrc}ex_output.c:10:P:Core:test_pass:0: Passed
+${lsrc}ex_output.c:16:F:Core:test_fail:0: Failure
+${lsrc}ex_output.c:20:E:Core:test_exit:0: (after this point) Early exit with return value 1"
 
 op0=`./ex_output CK_SILENT`
 op1=`./ex_output CK_MINIMAL`

diff --git a/tests/test_xml_output.sh b/tests/test_xml_output.sh
index 595e9f0471b5dad09d698b65193c9225a88acec1..166202763f62f3333c4760f702d57a9003a2799d 100755 (executable)
--- a/tests/test_xml_output.sh
+++ b/tests/test_xml_output.sh
@@ -11,21 +11,21 @@ expected="<?xml version=\"1.0\"?>
   <suite>
     <title>S1</title>
     <test result=\"success\">
-      <fn>ex_xml_output.c:8</fn>
+      <fn>ex_xml_output.c:10</fn>
       <id>test_pass</id>
       <iteration>0</iteration>
       <description>Core</description>
       <message>Passed</message>
     </test>
     <test result=\"failure\">
-      <fn>ex_xml_output.c:14</fn>
+      <fn>ex_xml_output.c:16</fn>
       <id>test_fail</id>
       <iteration>0</iteration>
       <description>Core</description>
       <message>Failure</message>
     </test>
     <test result=\"error\">
-      <fn>ex_xml_output.c:18</fn>
+      <fn>ex_xml_output.c:20</fn>
       <id>test_exit</id>
       <iteration>0</iteration>
       <description>Core</description>
@@ -35,28 +35,28 @@ expected="<?xml version=\"1.0\"?>
   <suite>
     <title>S2</title>
     <test result=\"success\">
-      <fn>ex_xml_output.c:26</fn>
+      <fn>ex_xml_output.c:28</fn>
       <id>test_pass2</id>
       <iteration>0</iteration>
       <description>Core</description>
       <message>Passed</message>
     </test>
     <test result=\"failure\">
-      <fn>ex_xml_output.c:32</fn>
+      <fn>ex_xml_output.c:34</fn>
       <id>test_loop</id>
       <iteration>0</iteration>
       <description>Core</description>
       <message>Iteration 0 failed</message>
     </test>
     <test result=\"success\">
-      <fn>ex_xml_output.c:32</fn>
+      <fn>ex_xml_output.c:34</fn>
       <id>test_loop</id>
       <iteration>1</iteration>
       <description>Core</description>
       <message>Passed</message>
     </test>
     <test result=\"failure\">
-      <fn>ex_xml_output.c:32</fn>
+      <fn>ex_xml_output.c:34</fn>
       <id>test_loop</id>
       <iteration>2</iteration>
       <description>Core</description>