<div dir="ltr">Take 2<div> </div><div>Bonus, added one more testing and it goes through in our CI-Environment on our try-master :)</div></div><div class="gmail_extra"> <div class="gmail_quote">On Fri, Aug 30, 2013 at 2:18 PM, Andreas Ericsson <<a href="mailto:ae@op5.se" target="_blank">ae@op5.se</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On 2013-08-29 14:42, Mattias Ryrlén wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> commit f0054ac856059183f6c7bc3f9e8a80965a8c0368 (HEAD, master) Author: Mattias Ryrlén <<a href="mailto:mattiasr@op5.com" target="_blank">mattiasr@op5.com</a>> Date: Thu Aug 29 14:34:39 2013 +0200 YES! test: build on machines with only one cpu There might be someone out there who still have only one cpu/core, let those build too. Signed-off-by: Mattias Ryrlén <<a href="mailto:mattiasr@op5.com" target="_blank">mattiasr@op5.com</a>> </blockquote> </div> While I sort of agree that tests should pass on single-cpu machines as well, this change renders the whole test useless, since we *always* return > 0 from online_cpus(). Adding a function (real_online_cpus()) which returns 0 when it can't reliably test for number of online cpus, and letting that be wrapped by online_cpus() so that the latter can retain its current behaviour would solve the problem. online_cpus() should then look like this: unsigned int online_cpus(void) { unsigned int cpus = real_online_cpus(); return cpus ? cpus : 1; } while the new function real_online_cpus() must take the body of the current online_cpus() function but be changed so that the fallback is to return 0. The test must then be changed to use real_online_cpus() instead. Would you like to reroll, or should I make the necessary changes and credit you with an "Reported-by"?<div class="im"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> diff --git a/lib/test-nsutils.c b/lib/test-nsutils.c index 1a23ee1..f835d67 100644 --- a/lib/test-nsutils.c +++ b/lib/test-nsutils.c @@ -31,10 +31,10 @@ int main(int argc, char **argv) asprintf(&s1, "arg varg foo %d", 12); s2 = mkstr("arg varg foo %d", 12); ok_str(s1, s2, "mkstr() must build proper strings"); - if (online_cpus() > 1) { + if (online_cpus() > 0) { t_pass("%d online cpus detected", online_cpus()); } else { - t_fail("Do you really have only one cpu core?"); + t_fail("No online cpus detected"); } return t_end(); } </blockquote> -- </div> Andreas Ericsson <a href="mailto:andreas.ericsson@op5.se" target="_blank">andreas.ericsson@op5.se</a> OP5 AB <a href="http://www.op5.se" target="_blank">www.op5.se</a> Tel: <a href="tel:%2B46%208-230225" value="+468230225" target="_blank">+46 8-230225</a> Fax: <a href="tel:%2B46%208-230231" value="+468230231" target="_blank">+46 8-230231</a> Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace. </blockquote></div> <div> </div>-- Vänliga hälsningar / Best Regards Mattias Ryrlén __________________________ op5 AB Första Långgatan 19 SE-413 27 Göteborg Mobil: +46 735-17 70 99 Support: +46 31-774 09 24 <a href="http://www.op5.com">www.op5.com</a> </div>