summaryrefslogtreecommitdiff
path: root/tests/test-json.c
diff options
context:
space:
mode:
authorAndy Zhou <azhou@nicira.com>2014-04-01 00:47:01 -0700
committerAndy Zhou <azhou@nicira.com>2014-04-03 11:17:17 -0700
commiteadd16449c6e5292603cf009d29ab0e249979717 (patch)
tree9fffd59e7f3668d844a9389c5ef75d73fa9c82d2 /tests/test-json.c
parent01fed651097a90ef9365ce6c2f16da2970a5444e (diff)
downloadopenvswitch-eadd16449c6e5292603cf009d29ab0e249979717.tar.gz
unit-test: Link 29 test programs into ovstest
Improve link speed by linking 29 test programs into ovstest. On my machine, running the following command against a fully built tree: $ touch lib/random.c; time make Improve the overall build time from 7 seconds to 3.5 seconds. Signed-off-by: Andy Zhou <azhou@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests/test-json.c')
-rw-r--r--tests/test-json.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/test-json.c b/tests/test-json.c
index c7c01c8e8..43cb9faa2 100644
--- a/tests/test-json.c
+++ b/tests/test-json.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
#include <stdio.h>
#include "util.h"
-
+#include "ovstest.h"
/* --pretty: If set, the JSON output is pretty-printed, instead of printed as
* compactly as possible. */
static int pretty = 0;
@@ -103,8 +103,8 @@ parse_multiple(FILE *stream)
return ok;
}
-int
-main(int argc, char *argv[])
+static void
+test_json_main(int argc, char *argv[])
{
const char *input_file;
FILE *stream;
@@ -154,5 +154,7 @@ main(int argc, char *argv[])
fclose(stream);
- return !ok;
+ exit(!ok);
}
+
+OVSTEST_REGISTER("test-json", test_json_main);