From e5ff59461450dda2e88e631634401dd1be017517 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 6 Jun 2011 11:42:17 +0200
Subject: [PATCH] spawn-pipe tests: Rename program.

* tests/test-spawn-pipe-main.c: Renamed from tests/test-spawn-pipe.c.
* tests/test-spawn-pipe-child.c: Update comment.
* tests/test-spawn-pipe.sh: Update.
* modules/spawn-pipe-tests (Files, Makefile.am): Update.
---
 ChangeLog                                           | 6 ++++++
 modules/spawn-pipe-tests                            | 6 +++---
 tests/test-spawn-pipe-child.c                       | 2 +-
 tests/{test-spawn-pipe.c => test-spawn-pipe-main.c} | 0
 tests/test-spawn-pipe.sh                            | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename tests/{test-spawn-pipe.c => test-spawn-pipe-main.c} (100%)

diff --git a/ChangeLog b/ChangeLog
index 91c512cc71..db473d86a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-06  Bruno Haible  <bruno@clisp.org>
 
+	spawn-pipe tests: Rename program.
+	* tests/test-spawn-pipe-main.c: Renamed from tests/test-spawn-pipe.c.
+	* tests/test-spawn-pipe-child.c: Update comment.
+	* tests/test-spawn-pipe.sh: Update.
+	* modules/spawn-pipe-tests (Files, Makefile.am): Update.
+
 	spawn-pipe tests: Like the child program only against libc.
 	* tests/test-spawn-pipe-child.c: New file, extracted from
 	tests/test-spawn-pipe.c.
diff --git a/modules/spawn-pipe-tests b/modules/spawn-pipe-tests
index 55cabf39f3..26e1240d79 100644
--- a/modules/spawn-pipe-tests
+++ b/modules/spawn-pipe-tests
@@ -1,6 +1,6 @@
 Files:
 tests/test-spawn-pipe.sh
-tests/test-spawn-pipe.c
+tests/test-spawn-pipe-main.c
 tests/test-spawn-pipe-child.c
 tests/macros.h
 
@@ -11,8 +11,8 @@ configure.ac:
 
 Makefile.am:
 TESTS += test-spawn-pipe.sh
-check_PROGRAMS += test-spawn-pipe test-spawn-pipe-child
-test_spawn_pipe_LDADD = $(LDADD) @LIBINTL@
+check_PROGRAMS += test-spawn-pipe-main test-spawn-pipe-child
+test_spawn_pipe_main_LDADD = $(LDADD) @LIBINTL@
 # The test-spawn-pipe-child program must be a real executable, not a libtool
 # wrapper script, and should link against as few libraries as possible.
 # Therefore don't link it against any libraries other than -lc.
diff --git a/tests/test-spawn-pipe-child.c b/tests/test-spawn-pipe-child.c
index f1d3f0f9ce..eefecf9c10 100644
--- a/tests/test-spawn-pipe-child.c
+++ b/tests/test-spawn-pipe-child.c
@@ -1,4 +1,4 @@
-/* Child program invoked by test-spawn-pipe..
+/* Child program invoked by test-spawn-pipe-main.
    Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-spawn-pipe.c b/tests/test-spawn-pipe-main.c
similarity index 100%
rename from tests/test-spawn-pipe.c
rename to tests/test-spawn-pipe-main.c
diff --git a/tests/test-spawn-pipe.sh b/tests/test-spawn-pipe.sh
index d650c05786..676026c86e 100755
--- a/tests/test-spawn-pipe.sh
+++ b/tests/test-spawn-pipe.sh
@@ -2,7 +2,7 @@
 
 st=0
 for i in 0 1 2 3 4 5 6 7 ; do
-  ./test-spawn-pipe${EXEEXT} ./test-spawn-pipe-child${EXEEXT} $i \
+  ./test-spawn-pipe-main${EXEEXT} ./test-spawn-pipe-child${EXEEXT} $i \
     || { echo test-spawn-pipe.sh: iteration $i failed >&2; st=1; }
 done
 exit $st
-- 
2.30.2