[Nagios-checkins] SF.net SVN: nagios:[2704] nagioscore/trunk/lib/test-nsutils.c

[<ag...@us...>]

Revision: 2704
          http://nagios.svn.sourceforge.net/nagios/?rev=2704&view=rev
Author:   ageric
Date:     2013-03-25 12:32:45 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
lib/test-nsutils: Update to use the defined functions

Way back I intended to give these utils a common prefix, and the
prefix lived on in the tests but not in the commit that actually
introduced the commit. Bad, bad Andreas...

Signed-off-by: Andreas Ericsson <ae...@op...>

Modified Paths:
--------------
    nagioscore/trunk/lib/test-nsutils.c

Modified: nagioscore/trunk/lib/test-nsutils.c
===================================================================
--- nagioscore/trunk/lib/test-nsutils.c	2013-03-25 12:32:27 UTC (rev 2703)
+++ nagioscore/trunk/lib/test-nsutils.c	2013-03-25 12:32:45 UTC (rev 2704)
@@ -6,20 +6,30 @@
 	struct timeval start, stop;
 	float f_delta;
 	int msec_delta;
+	char *s1, *s2;
 
+	t_set_colors(0);
+	t_verbose = 1;
 	t_start("tv_delta tests");
-	t_verbose = 1;
-	t_set_colors(0);
 
 	stop.tv_sec = start.tv_sec = time(NULL);
 	stop.tv_usec = 2500;
 	start.tv_usec = 0;
-	msec_delta = nsu_tv_delta_msec(&start, &stop);
-	t_ok(msec_delta == 2, "nsu_tv_delta_msec()");
-	f_delta = nsu_tv_delta_f(&start, &stop) * 1000;
-	t_ok((double)f_delta == (double)2.5, "nsu_tv_delta_f() * 1000 is %.2f and should be 2.5", f_delta);
+	msec_delta = tv_delta_msec(&start, &stop);
+	t_ok(msec_delta == 2, "tv_delta_msec()");
+	f_delta = tv_delta_f(&start, &stop) * 1000;
+	t_ok((double)f_delta == (double)2.5, "tv_delta_f() * 1000 is %.2f and should be 2.5", f_delta);
 	gettimeofday(&start, NULL);
 	memcpy(&stop, &start, sizeof(start));
 	stop.tv_sec += 100;
+
+	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) {
+		t_pass("%d online cpus detected", online_cpus());
+	} else {
+		t_fail("Do you really have only one cpu core?");
+	}
 	return t_end();
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.