[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3981 - in GNUnet/src/applications/fs: collection ecrs fsui
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3981 - in GNUnet/src/applications/fs: collection ecrs fsui namespace |
|
Date: |
Tue, 19 Dec 2006 16:41:15 -0800 (PST) |
Author: grothoff
Date: 2006-12-19 16:41:07 -0800 (Tue, 19 Dec 2006)
New Revision: 3981
Modified:
GNUnet/src/applications/fs/collection/collectiontest.c
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/fs/ecrs/namespacetest.c
GNUnet/src/applications/fs/ecrs/searchtest.c
GNUnet/src/applications/fs/fsui/downloadtest.c
GNUnet/src/applications/fs/fsui/fsuitest.c
GNUnet/src/applications/fs/fsui/fsuitest2.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/serializetest.c
GNUnet/src/applications/fs/fsui/serializetest2.c
GNUnet/src/applications/fs/namespace/namespace_infotest.c
Log:
use check instead of ge-assert to kill running gnunetds
Modified: GNUnet/src/applications/fs/collection/collectiontest.c
===================================================================
--- GNUnet/src/applications/fs/collection/collectiontest.c 2006-12-19
01:05:37 UTC (rev 3980)
+++ GNUnet/src/applications/fs/collection/collectiontest.c 2006-12-20
00:41:07 UTC (rev 3981)
@@ -52,15 +52,16 @@
GC_free(cfg);
return -1;
}
+ sock = NULL;
#if START_DAEMON
daemon = os_daemon_start(NULL,
cfg,
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
#endif
ok = YES;
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-12-19 01:05:37 UTC (rev
3980)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-12-20 00:41:07 UTC (rev
3981)
@@ -267,9 +267,10 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ sock = NULL;
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
ok = YES;
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
sock = client_connection_create(NULL, cfg);
Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c 2006-12-19 01:05:37 UTC
(rev 3980)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c 2006-12-20 00:41:07 UTC
(rev 3981)
@@ -113,13 +113,14 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
- PTHREAD_SLEEP(5 * cronSECONDS);
-
- failureCount += testNamespace();
-
+ if (OK != connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS)) {
+ failureCount++;
+ } else {
+ PTHREAD_SLEEP(5 * cronSECONDS);
+ failureCount += testNamespace();
+ }
GE_ASSERT(NULL, OK == os_daemon_stop(NULL, daemon));
return (failureCount == 0) ? 0 : 1;
Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c 2006-12-19 01:05:37 UTC
(rev 3980)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c 2006-12-20 00:41:07 UTC
(rev 3981)
@@ -94,14 +94,15 @@
GC_free(cfg);
return -1;
}
+ sock = NULL;
daemon = os_daemon_start(NULL,
cfg,
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
ok = YES;
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
sock = client_connection_create(NULL, cfg);
Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c 2006-12-19 01:05:37 UTC
(rev 3980)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c 2006-12-20 00:41:07 UTC
(rev 3981)
@@ -250,9 +250,9 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
#endif
Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c 2006-12-19 01:05:37 UTC (rev
3980)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c 2006-12-20 00:41:07 UTC (rev
3981)
@@ -135,10 +135,10 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
#endif
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
ok = YES;
Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-12-19 01:05:37 UTC (rev
3980)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-12-20 00:41:07 UTC (rev
3981)
@@ -61,11 +61,11 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
#endif
ok = YES;
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2006-12-19 01:05:37 UTC
(rev 3980)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2006-12-20 00:41:07 UTC
(rev 3981)
@@ -137,9 +137,9 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
#endif
Modified: GNUnet/src/applications/fs/fsui/serializetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest.c 2006-12-19 01:05:37 UTC
(rev 3980)
+++ GNUnet/src/applications/fs/fsui/serializetest.c 2006-12-20 00:41:07 UTC
(rev 3981)
@@ -185,9 +185,9 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
#endif
Modified: GNUnet/src/applications/fs/fsui/serializetest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest2.c 2006-12-19 01:05:37 UTC
(rev 3980)
+++ GNUnet/src/applications/fs/fsui/serializetest2.c 2006-12-20 00:41:07 UTC
(rev 3981)
@@ -324,9 +324,9 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
PTHREAD_SLEEP(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
#endif
Modified: GNUnet/src/applications/fs/namespace/namespace_infotest.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_infotest.c 2006-12-19
01:05:37 UTC (rev 3980)
+++ GNUnet/src/applications/fs/namespace/namespace_infotest.c 2006-12-20
00:41:07 UTC (rev 3981)
@@ -59,9 +59,9 @@
"peer.conf",
NO);
GE_ASSERT(NULL, daemon > 0);
- GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
- cfg,
- 30 * cronSECONDS));
+ CHECK(OK == connection_wait_for_running(NULL,
+ cfg,
+ 30 * cronSECONDS));
ok = YES;
NS_deleteNamespace(ectx,
cfg,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3981 - in GNUnet/src/applications/fs: collection ecrs fsui namespace,
grothoff <=