Alexandre Julliard : winetest: Report the correct source directory for program tests.

Alexandre Julliard julliard at winehq.org
Mon Feb 8 11:06:05 CST 2010


Module: wine
Branch: master
Commit: ecb2d7bd935665b51025e1a643efc9e3b4d37d66
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ecb2d7bd935665b51025e1a643efc9e3b4d37d66

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Feb  6 20:36:12 2010 +0100

winetest: Report the correct source directory for program tests.

---

 programs/winetest/main.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index a20fa06..e0b9ced 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -300,16 +300,24 @@ static const char* get_test_source_file(const char* test, const char* subtest)
 	{ 0, 0 }
     };
     static char buffer[MAX_PATH];
-    int i;
+    int i, len = strlen(test);
+
+    if (len > 4 && !strcmp( test + len - 4, ".exe" ))
+    {
+        len = sprintf(buffer, "programs/%s", test) - 4;
+        buffer[len] = 0;
+    }
+    else len = sprintf(buffer, "dlls/%s", test);
 
     for (i = 0; special_dirs[i][0]; i++) {
 	if (strcmp(test, special_dirs[i][0]) == 0) {
-	    test = special_dirs[i][1];
+            strcpy( buffer, special_dirs[i][1] );
+            len = strlen(buffer);
 	    break;
 	}
     }
 
-    snprintf(buffer, sizeof(buffer), "dlls/%s/tests/%s.c", test, subtest);
+    sprintf(buffer + len, "/tests/%s.c", subtest);
     return buffer;
 }
 




More information about the wine-cvs mailing list