git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unification of netdev&netdev_dev in pltap&tunnel
[sliver-openvswitch.git]
/
tests
/
test-timeval.c
diff --git
a/tests/test-timeval.c
b/tests/test-timeval.c
index
442b27a
..
9896cf7
100644
(file)
--- a/
tests/test-timeval.c
+++ b/
tests/test-timeval.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011 Nicira
Networks
.
+ * Copyright (c) 2009, 2010, 2011 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-97,6
+97,12
@@
main(int argc, char *argv[])
if (argc != 2) {
usage();
} else if (!strcmp(argv[1], "plain")) {
if (argc != 2) {
usage();
} else if (!strcmp(argv[1], "plain")) {
+ /* If we're not caching time there isn't much to test and SIGALRM won't
+ * be around to pull us out of the select() call, so just skip out */
+ if (!CACHE_TIME) {
+ exit (77);
+ }
+
do_test();
} else if (!strcmp(argv[1], "daemon")) {
/* Test that time still advances even in a daemon. This is an
do_test();
} else if (!strcmp(argv[1], "daemon")) {
/* Test that time still advances even in a daemon. This is an
@@
-104,6
+110,10
@@
main(int argc, char *argv[])
char cwd[1024], *pidfile;
FILE *success;
char cwd[1024], *pidfile;
FILE *success;
+ if (!CACHE_TIME) {
+ exit (77);
+ }
+
assert(getcwd(cwd, sizeof cwd) == cwd);
unlink("test-timeval.success");
assert(getcwd(cwd, sizeof cwd) == cwd);
unlink("test-timeval.success");