Patching mwrap for debugging CI failures

pret · Jan 2, 2025 · 8b003d0 · 8b003d0
1 parent 1489216
commit 8b003d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -98,7 +98,7 @@ $(VENV_ACTIVATE):
 	. $(VENV_ACTIVATE) ; pip install -r requirements.txt
 
 $(BUILD)/build.ninja: $(ROOT_INI) $(DOT_MWCONFIG) $(VENV_ACTIVATE) | $(BUILD)
-	MWCONFIG=$(abspath $(DOT_MWCONFIG)) $(VENV_MESON) setup \
+	. $(VENV_ACTIVATE) ; MWCONFIG=$(abspath $(DOT_MWCONFIG)) $(MESON) setup \
 	         --wrap-mode=nopromote \
 	         --native-file=meson/$(NATIVE) \
 	         --native-file=$(ROOT_INI) \

diff --git a/tools/cw/mwrap.c b/tools/cw/mwrap.c
@@ -528,6 +528,8 @@ int _tmain(int argc, _TCHAR *argv[])
 
     // Add the wine command if requested
     _TCHAR *wine = utftotc(cfg.wine);
+    printf("cfg.wine: %s\n", cfg.wine);
+    printf("wine:     %s\n", wine);
     if (wine) {
         new_argc += 1;
         new_argv = realloc(new_argv, sizeof(*new_argv) * (new_argc + 1));
@@ -612,6 +614,11 @@ int _tmain(int argc, _TCHAR *argv[])
         printf("\n");
     }
     pid_t pid;
+    printf("new argv:");
+    for (size_t i = 0; i < new_argc; i++) {
+        printf(" %s", new_argv[i]);
+    }
+    printf("\n");
     if (posix_spawn(&pid, new_argv[0], NULL, NULL, new_argv, environ) != 0) {
         perror(PROGRAM_NAME ": posix_spawn");
         exit(EXIT_FAILURE);