Skip to contentSkip to conversation

Fix a building error at fork cases.

PATCH In review Peng Haitao 2 participants 2 messages Jan 13, 2011 – Jan 14, 2011

lore
Share & tools
lore

Peng Haitao

author
#0 lore raw

PATCH 1/1 Fix a building error at fork cases.

Hi Garrett,

Fix building error of fork cases.

Signed-off-by Peng Haitao <[email protected]>
---
 .../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(-)
testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c +1 -2
index 70f29d1..ef75ce9 100644
@@ -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
+}
testcases/open_posix_testsuite/conformance/interfaces/fork/7-1.c +2 -1
index 09f229e..dfa80ce 100644
@@ -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
+}
testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c +1 -2
index 086dc33..6e73919 100644
@@ -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
+}
Signature · 17 lines
1.7.0.4

-- 
Best Regards,
Peng Haitao


------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
#1 lore raw
Quoted 3 lines · Peng Haitao

Hi Garrett,

Fix building error of fork cases.

Fixed -- thanks!
-Garrett

------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list