From 602714a8dae08e395c8834aa059375de7dd877c0 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sun, 25 Nov 2012 13:52:20 -0500 Subject: [PATCH] tests/spawn-*.c: fix on Windows Need to append ".exe" to the spawned binary name on Windows https://bugzilla.gnome.org/show_bug.cgi?id=679683 --- glib/tests/Makefile.am | 2 ++ glib/tests/spawn-multithreaded.c | 4 ++-- glib/tests/spawn-singlethread.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am index 983259b65..14310757e 100644 --- a/glib/tests/Makefile.am +++ b/glib/tests/Makefile.am @@ -249,10 +249,12 @@ TEST_PROGS += 1bit-emufutex TEST_PROGS += spawn-multithreaded spawn_multithreaded_SOURCES = spawn-multithreaded.c +spawn_multithreaded_CFLAGS = -DEXEEXT=\"$(EXEEXT)\" spawn_multithreaded_LDADD = $(progs_ldadd) TEST_PROGS += spawn-singlethread spawn_singlethread_SOURCES = spawn-singlethread.c +spawn_singlethread_CFLAGS = -DEXEEXT=\"$(EXEEXT)\" spawn_singlethread_LDADD = $(progs_ldadd) TEST_PROGS += gwakeup diff --git a/glib/tests/spawn-multithreaded.c b/glib/tests/spawn-multithreaded.c index baccf362b..781ae4a25 100644 --- a/glib/tests/spawn-multithreaded.c +++ b/glib/tests/spawn-multithreaded.c @@ -222,11 +222,11 @@ main (int argc, g_test_init (&argc, &argv, NULL); dirname = g_path_get_dirname (argv[0]); - echo_prog_path = g_build_filename (dirname, "test-spawn-echo", NULL); + echo_prog_path = g_build_filename (dirname, "test-spawn-echo" EXEEXT, NULL); if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS)) { g_free (echo_prog_path); - echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo", NULL); + echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo" EXEEXT, NULL); } g_free (dirname); diff --git a/glib/tests/spawn-singlethread.c b/glib/tests/spawn-singlethread.c index 4898b72d8..ffc1601e4 100644 --- a/glib/tests/spawn-singlethread.c +++ b/glib/tests/spawn-singlethread.c @@ -194,11 +194,11 @@ main (int argc, g_test_init (&argc, &argv, NULL); dirname = g_path_get_dirname (argv[0]); - echo_prog_path = g_build_filename (dirname, "test-spawn-echo", NULL); + echo_prog_path = g_build_filename (dirname, "test-spawn-echo" EXEEXT, NULL); if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS)) { g_free (echo_prog_path); - echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo", NULL); + echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo" EXEEXT, NULL); } #ifndef SRCDIR #define SRCDIR dirname