[LTP] [PATCH] Fix a building error at fork cases.

[Peng H. <pe...@cn...>]

Hi Garrett,

Fix building error of fork cases.

Signed-off-by: Peng Haitao <pe...@cn...>

---
 .../conformance/interfaces/fork/21-1.c             |    3 +--
 .../conformance/interfaces/fork/7-1.c              |    3 ++-
 .../conformance/interfaces/fork/8-1.c              |    3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
index 70f29d1..ef75ce9 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
@@ -99,7 +99,6 @@ void * threaded(void * arg)
 	}
 
 	if (*(pid_t *) arg != getpid())
->>>>>>> origin
 	{
 		FAILED("The thread is executing in the child process");
 	}
@@ -201,4 +200,4 @@ int main(int argc, char * argv[])
 
 #endif
 	PASSED;
-}
\ No newline at end of file
+}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/7-1.c
index 09f229e..dfa80ce 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/7-1.c
@@ -117,6 +117,7 @@ int main(int argc, char * argv[])
 		}
 
 		ret = system("gencat "MESSCAT_OUT" "MESSCAT_IN);
+	}
 
 	if (messcat == -1)
 	{
@@ -161,4 +162,4 @@ int main(int argc, char * argv[])
 	output("Test passed\n");
 #endif
 	PASSED;
-}
\ No newline at end of file
+}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
index 086dc33..6e73919 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
@@ -170,7 +170,6 @@ int main(int argc, char * argv[])
 			}
 		}
 		while ((child_tms.tms_utime + child_tms.tms_stime) <= 0);
->>>>>>> origin
 
 		/* We're done */
 		exit(PTS_PASS);
@@ -226,4 +225,4 @@ int main(int argc, char * argv[])
 #endif
 
 	PASSED;
-}
\ No newline at end of file
+}
-- 
1.7.0.4

-- 
Best Regards,
Peng Haitao