[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21944 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21944 - gnunet/src/testing |
Date: |
Wed, 13 Jun 2012 09:36:54 +0200 |
Author: grothoff
Date: 2012-06-13 09:36:54 +0200 (Wed, 13 Jun 2012)
New Revision: 21944
Modified:
gnunet/src/testing/Makefile.am
gnunet/src/testing/gnunet-testing-run-service.c
Log:
-LRN: kind of fix for gnunet-testing-run-service for W32
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2012-06-13 01:16:20 UTC (rev 21943)
+++ gnunet/src/testing/Makefile.am 2012-06-13 07:36:54 UTC (rev 21944)
@@ -37,7 +37,10 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(GN_LIBINTL)
+gnunet_testing_run_service_DEPENDENCIES = \
+ libgnunettesting.la
+
check_PROGRAMS = \
test_testing_portreservation \
test_testing_peerstartup \
Modified: gnunet/src/testing/gnunet-testing-run-service.c
===================================================================
--- gnunet/src/testing/gnunet-testing-run-service.c 2012-06-13 01:16:20 UTC
(rev 21943)
+++ gnunet/src/testing/gnunet-testing-run-service.c 2012-06-13 07:36:54 UTC
(rev 21944)
@@ -112,7 +112,7 @@
testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
const struct GNUNET_TESTING_Peer *peer)
{
- my_peer = peer;
+ my_peer = (struct GNUNET_TESTING_Peer *) peer;
tmpfilename = tmpnam (NULL);
if (NULL == tmpfilename)
{
@@ -134,7 +134,14 @@
GNUNET_break(NULL != GNUNET_SIGNAL_handler_install(SIGTERM, &cleanup));
GNUNET_break(NULL != GNUNET_SIGNAL_handler_install(SIGINT, &cleanup));
+#if !WINDOWS
fh.fd = 0; /* 0=stdin */
+#else
+ /* FIXME: box GetStdHandle(STD_INPUT_HANDLE) somehow.
+ * Note that it will only work if parent process spawns
+ * gnunet-testing-run-service with custom-created asynchronous standard input
+ */
+#endif
tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, &fh,
&stdin_cb, NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21944 - gnunet/src/testing,
gnunet <=