From 68ae235577618800719d48c9ba84dd3bdf82e7a2 Mon Sep 17 00:00:00 2001 From: dmitry pervushin Date: Fri, 15 Mar 2013 22:51:22 +0100 Subject: Renamed 1st test, added some colors --- sync-basic/sync-basic.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) (limited to 'sync-basic') diff --git a/sync-basic/sync-basic.c b/sync-basic/sync-basic.c index 47b0960..5ae1b39 100644 --- a/sync-basic/sync-basic.c +++ b/sync-basic/sync-basic.c @@ -29,6 +29,10 @@ char testname[32]; /* fd of SW_SYNC_DEV */ int sw_fd; +#define RED "\x1B[31m" +#define GREEN "\x1B[32m" +#define NORMAL "\x1B[0m" + void fatal (int error, const char *fmt, ...) { va_list ap; @@ -40,10 +44,29 @@ void fatal (int error, const char *fmt, ...) fprintf (stderr, " (error %d [%s])", error, strerror (error)); va_end (ap); fprintf (stderr, "\n"); + printf(RED); printf ("%d [%s]: test failed\n", testno, testname); + printf(NORMAL); exit (1); } +void pass (const char *fmt, ...) +{ + va_list ap; + + fprintf (stderr, "Test %d: ", testno); + if (fmt == NULL) + fprintf (stderr, "Passed"); + else { + va_start (ap, fmt); + vfprintf (stderr, fmt, ap); + va_end (ap); + } + fprintf (stderr, "\n"); + printf(GREEN); + printf ("%d [%s]: test passed\n", testno, testname); +} + void create_and_delete_fence (void) { struct sw_sync_create_fence_data f; @@ -61,8 +84,8 @@ void create_and_delete_fence (void) ret = close (f.fence); if (ret < 0) fatal (errno, "can't delete fence"); - - printf ("%d [%s]: test passed\n", testno, __func__); + + pass(NULL); } void create_fence_invalid (void) @@ -77,7 +100,7 @@ void create_fence_invalid (void) if (ret >= 0 || errno != EFAULT) fatal (0, "expect -1 and EFAULT, but got %d and %d", ret, errno); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); } #define TOOMANY 100000 /* should be larger than max fds per process */ @@ -110,7 +133,7 @@ void create_many_fences (void) fatal (errno, "error closing fence %d of %d", i, nr); } - printf ("%d [%s]: test passed (%d fences was used)\n", testno, __func__, nr); + pass("%d fences were used", nr); } void fence_info (void) @@ -147,7 +170,7 @@ void fence_info (void) if (ret < 0) fatal (errno, "can't delete fence"); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); } void fence_info_invalid (void) @@ -169,7 +192,7 @@ void fence_info_invalid (void) free (d); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); } void fence_merge (void) @@ -226,7 +249,7 @@ void fence_merge (void) if (ret < 0) fatal (errno, "can't close fence 1"); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); } void fence_merge_itself (void) @@ -257,7 +280,7 @@ void fence_merge_itself (void) if (ret < 0) fatal (errno, "can't close fence 1"); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); } void fence_merge_invalid (void) @@ -286,19 +309,18 @@ void fence_merge_invalid (void) if (ret < 0) fatal (errno, "can't close fence 1"); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); } int main (int argc, char *argv[]) { /* 0 - just try to open */ testno++; - strcpy (testname, __func__); - + strcpy (testname, "try-open"); sw_fd = open (SW_SYNC_DEV, O_RDWR); if (sw_fd < 0) fatal (errno, "can't open '%s'", SW_SYNC_DEV); - printf ("%d [%s]: test passed\n", testno, __func__); + pass(NULL); /* 1 - create and delete just one fence */ create_and_delete_fence (); -- cgit v1.2.3