Revert "tests/spawn-*.c: fix on Windows"

This reverts commit 602714a8dae08e395c8834aa059375de7dd877c0.

diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 1431075..983259b 100644 (file)
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -249,12 +249,10 @@ 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 781ae4a..baccf36 100644 (file)
--- 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" EXEEXT, NULL);
+  echo_prog_path = g_build_filename (dirname, "test-spawn-echo", 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" EXEEXT, NULL);
+      echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo", NULL);
     }
   g_free (dirname);
 

diff --git a/glib/tests/spawn-singlethread.c b/glib/tests/spawn-singlethread.c
index ffc1601..4898b72 100644 (file)
--- 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" EXEEXT, NULL);
+  echo_prog_path = g_build_filename (dirname, "test-spawn-echo", 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" EXEEXT, NULL);
+      echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo", NULL);
     }
 #ifndef SRCDIR
 #define SRCDIR dirname