Alexandre Julliard : makefiles: Add intermediate test target to propagate test failures status properly.

Alexandre Julliard julliard at winehq.org
Mon Feb 26 13:42:20 CST 2018


Module: wine
Branch: master
Commit: 5aa0144ec6969b42563af449847edf6c447de0d4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5aa0144ec6969b42563af449847edf6c447de0d4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 26 16:38:59 2018 +0100

makefiles: Add intermediate test target to propagate test failures status properly.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/makedep.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index bba25e0..470a495 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3494,7 +3494,7 @@ static void output_subdirs( struct makefile *make )
         }
         else if (submake->testdll)
         {
-            output( "check test::\n" );
+            output( "%s/test: dummy\n", subdir );
             output( "\t at cd %s && $(MAKE) test\n", subdir );
             strarray_add( &winetest_deps, subdir );
             strarray_add( &builddeps_deps, subdir );
@@ -3536,6 +3536,14 @@ static void output_subdirs( struct makefile *make )
         output( "programs/winetest:" );
         output_filenames( winetest_deps );
         output( "\n" );
+        output( "check test:" );
+        for (i = 0; i < winetest_deps.count; i++)
+        {
+            char *target = strmake( "%s/test", winetest_deps.str[i] );
+            output_filename( target );
+            strarray_add( &make->phony_targets, target );
+        }
+        output( "\n" );
         strarray_add( &make->phony_targets, "check" );
         strarray_add( &make->phony_targets, "test" );
     }




More information about the wine-cvs mailing list