Francois Gouget : testbot/reporttest: Fix duplicated source paths.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 89cfa0482cb88617a4b044d678b1b311cf55cbaf
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=89cfa0482cb88617a4b044d67...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Mar 24 03:28:22 2017 +0100

testbot/reporttest: Fix duplicated source paths.

The winetest website shows the source path as the title for the test so
duplicates are confusing.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/src/reporttest/report.template | 6 +++---
 testbot/src/reporttest/reporttest.c    | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template
index cb83ad7..d66b829 100644
--- a/testbot/src/reporttest/report.template
+++ b/testbot/src/reporttest/report.template
@@ -262,7 +262,7 @@ eventlog.c:20: Test failed: Something wrong
 088c:eventlog: 408 tests executed (0 marked as todo, 0 failures), 0 skipped.
 advapi32:eventlog:088c done (3) in 4s
 
-advapi32:lsa start dlls/advapi32/tests/crypt.c -
+advapi32:lsa start dlls/advapi32/tests/lsa.c -
 ----- A unit test with no test summary line
 ----- Expected assessement: "Missing test summary" error
 advapi32:lsa:083c done (0) in 0s
@@ -299,7 +299,7 @@ advpack:advpack start dlls/advpack/tests/advpack.c -
 0da0:advpack: 99 tests executed (0 marked as todo, 0 failures), 0 skipped.
 advpack:advpack:0da0 done (0) in 0s
 
-advpack:files start dlls/advapi32/tests/crypt.c -
+advpack:files start dlls/advpack/tests/files.c -
 ----- A unit test with a failed test in the main process
 ----- Expected assessement: 1 failure
 files.c:20: Test failed: A failure in the main process
@@ -1020,7 +1020,7 @@ stub xcopy.exe:xcopy
 stub xmllite:reader
 stub xmllite:writer
 
-xmllite:writer start fake/source/writer.c -
+xmllite:writer start dlls/xmllite/tests/writer.c -
 ----- A unit test with a misplaced test failed line
 ----- Expected assessement: "Misplaced test failed line" error
 See the similar scenario before but note the lack of the extra test summary line
diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c
index 122f90e..fecaa50 100644
--- a/testbot/src/reporttest/reporttest.c
+++ b/testbot/src/reporttest/reporttest.c
@@ -236,13 +236,14 @@ int main(int argc, char** argv)
                 fputs(line, stdout);
                 return 1;
             }
+            *unit = '\0';
             unit++;
-            line[strlen(line)-1] = '\0';
-            fprintf(logfile, "%s start fake/source/%s.c -\n", line+5, unit);
+            unit[strlen(unit)-1] = '\0';
+            fprintf(logfile, "%s:%s start fake/%s/%s.c -\n", line+5, unit, line+5, unit);
             fprintf(logfile, "----- A standard successful unit test\n");
             fprintf(logfile, "----- Expected assessement: Success\n");
             fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit);
-            fprintf(logfile, "%s:1234 done (0) in 0s\n", line+5);
+            fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", line+5, unit);
         }
         else
         {