update test
authorHajime Tazaki <tazaki@nict.go.jp>
Wed, 11 Apr 2012 11:21:19 +0900
changeset 181811be862c59
parent 17 1c3c791066b8
child 19 f86f5b19833f
update test
120406-dce-quagga-support.patch
120410-dce-umip-support.patch
     1.1 --- a/120406-dce-quagga-support.patch	Wed Apr 11 00:11:36 2012 +0900
     1.2 +++ b/120406-dce-quagga-support.patch	Wed Apr 11 11:21:19 2012 +0900
     1.3 @@ -825,7 +825,7 @@
     1.4  -#endif /* QUAGGA_HELPER_H */
     1.5  diff -r 28c0c7f781c1 model/dce-fd.cc
     1.6  --- a/model/dce-fd.cc	Thu Mar 29 17:00:46 2012 +0200
     1.7 -+++ b/model/dce-fd.cc	Mon Apr 09 10:03:32 2012 +0900
     1.8 ++++ b/model/dce-fd.cc	Wed Apr 11 10:56:47 2012 +0900
     1.9  @@ -345,12 +345,6 @@
    1.10   
    1.11     Ptr<SocketFdFactory>  factory = 0;
    1.12 @@ -841,7 +841,7 @@
    1.13         factory = manager->GetObject<SocketFdFactory> ();
    1.14  diff -r 28c0c7f781c1 model/libc-ns3.h
    1.15  --- a/model/libc-ns3.h	Thu Mar 29 17:00:46 2012 +0200
    1.16 -+++ b/model/libc-ns3.h	Mon Apr 09 10:03:32 2012 +0900
    1.17 ++++ b/model/libc-ns3.h	Wed Apr 11 10:56:47 2012 +0900
    1.18  @@ -412,7 +412,7 @@
    1.19   DCE    (ftruncate)
    1.20   
    1.21 @@ -862,7 +862,7 @@
    1.22   
    1.23  diff -r 28c0c7f781c1 model/linux-socket-fd-factory.cc
    1.24  --- a/model/linux-socket-fd-factory.cc	Thu Mar 29 17:00:46 2012 +0200
    1.25 -+++ b/model/linux-socket-fd-factory.cc	Mon Apr 09 10:03:32 2012 +0900
    1.26 ++++ b/model/linux-socket-fd-factory.cc	Wed Apr 11 10:56:47 2012 +0900
    1.27  @@ -254,6 +254,10 @@
    1.28   {
    1.29     LinuxSocketFdFactory *self = (LinuxSocketFdFactory *)kernel;
    1.30 @@ -887,7 +887,7 @@
    1.31     Ptr<LinuxDeviceStateListener> listener = Create <LinuxDeviceStateListener> (device, this);
    1.32  diff -r 28c0c7f781c1 model/utils.cc
    1.33  --- a/model/utils.cc	Thu Mar 29 17:00:46 2012 +0200
    1.34 -+++ b/model/utils.cc	Mon Apr 09 10:03:32 2012 +0900
    1.35 ++++ b/model/utils.cc	Wed Apr 11 10:56:47 2012 +0900
    1.36  @@ -191,6 +191,11 @@
    1.37   void UtilsDoSignal (void)
    1.38   {
    1.39 @@ -902,7 +902,7 @@
    1.40     for (std::vector<SignalHandler>::iterator i = current->process->signalHandlers.begin (); 
    1.41  diff -r 28c0c7f781c1 test/dce-manager-test.cc
    1.42  --- a/test/dce-manager-test.cc	Thu Mar 29 17:00:46 2012 +0200
    1.43 -+++ b/test/dce-manager-test.cc	Mon Apr 09 10:03:32 2012 +0900
    1.44 ++++ b/test/dce-manager-test.cc	Wed Apr 11 10:56:47 2012 +0900
    1.45  @@ -161,13 +161,15 @@
    1.46         {  "test-random", 0, "", false },
    1.47         {  "test-local-socket", 0, "", false },
    1.48 @@ -915,14 +915,14 @@
    1.49         {  "test-name", 0, "" , false},
    1.50         {  "test-pipe", 0, "" , false},
    1.51         {  "test-dirent", 0, "" , false},
    1.52 -+      //      {  "test-socket", 0, "" , true},
    1.53 -+      //      {  "test-bug-multi-select", 0, "" , true},
    1.54 ++      {  "test-socket", 30, "" , true},
    1.55 ++      {  "test-bug-multi-select", 30, "" , true},
    1.56     };
    1.57   
    1.58     // Prepare directories and files for test-stdio
    1.59  diff -r 28c0c7f781c1 test/test-bug-multi-select.cc
    1.60  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    1.61 -+++ b/test/test-bug-multi-select.cc	Mon Apr 09 10:03:32 2012 +0900
    1.62 ++++ b/test/test-bug-multi-select.cc	Wed Apr 11 10:56:47 2012 +0900
    1.63  @@ -0,0 +1,199 @@
    1.64  +#include <stdio.h>
    1.65  +#include <sys/select.h>
    1.66 @@ -1125,7 +1125,7 @@
    1.67  +}
    1.68  diff -r 28c0c7f781c1 test/test-socket.cc
    1.69  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    1.70 -+++ b/test/test-socket.cc	Mon Apr 09 10:03:32 2012 +0900
    1.71 ++++ b/test/test-socket.cc	Wed Apr 11 10:56:47 2012 +0900
    1.72  @@ -0,0 +1,395 @@
    1.73  +#define _GNU_SOURCE 1
    1.74  +#include <sys/types.h>
    1.75 @@ -1206,7 +1206,7 @@
    1.76  +  // RECV interface via PKTINFO
    1.77  +  cmsg = CMSG_FIRSTHDR (&msg);
    1.78  +  pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg);
    1.79 -+  TEST_ASSERT_EQUAL (pktinfo->ipi_ifindex, 0); // Loopback Interface
    1.80 ++  TEST_ASSERT_EQUAL (pktinfo->ipi_ifindex, 1); // Loopback Interface
    1.81  +
    1.82  +
    1.83  +  // sockopt IP_HDRINCL
    1.84 @@ -1524,7 +1524,7 @@
    1.85  +}
    1.86  diff -r 28c0c7f781c1 test/wscript
    1.87  --- a/test/wscript	Thu Mar 29 17:00:46 2012 +0200
    1.88 -+++ b/test/wscript	Mon Apr 09 10:03:32 2012 +0900
    1.89 ++++ b/test/wscript	Wed Apr 11 10:56:47 2012 +0900
    1.90  @@ -31,6 +31,8 @@
    1.91       new_test(bld, 'test-netdb', '')
    1.92       new_test(bld, 'test-env', '')
    1.93 @@ -1536,7 +1536,7 @@
    1.94       new_test(bld, 'test-select', 'PTHREAD')
    1.95  diff -r 28c0c7f781c1 utils/setenv.sh
    1.96  --- a/utils/setenv.sh	Thu Mar 29 17:00:46 2012 +0200
    1.97 -+++ b/utils/setenv.sh	Mon Apr 09 10:03:32 2012 +0900
    1.98 ++++ b/utils/setenv.sh	Wed Apr 11 10:56:47 2012 +0900
    1.99  @@ -1,6 +1,6 @@
   1.100   #!/bin/bash
   1.101   # Set environnement for ns3 dce
   1.102 @@ -1547,7 +1547,7 @@
   1.103   BASE=$PWD
   1.104  diff -r 28c0c7f781c1 wscript
   1.105  --- a/wscript	Thu Mar 29 17:00:46 2012 +0200
   1.106 -+++ b/wscript	Mon Apr 09 10:03:32 2012 +0900
   1.107 ++++ b/wscript	Wed Apr 11 10:56:47 2012 +0900
   1.108  @@ -26,6 +26,7 @@
   1.109       ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)
   1.110       ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)
     2.1 --- a/120410-dce-umip-support.patch	Wed Apr 11 00:11:36 2012 +0900
     2.2 +++ b/120410-dce-umip-support.patch	Wed Apr 11 11:21:19 2012 +0900
     2.3 @@ -2,7 +2,7 @@
     2.4  
     2.5  diff -r e503e546d382 model/dce-fd.cc
     2.6  --- a/model/dce-fd.cc	Mon Apr 09 10:03:33 2012 +0900
     2.7 -+++ b/model/dce-fd.cc	Wed Apr 11 00:10:58 2012 +0900
     2.8 ++++ b/model/dce-fd.cc	Wed Apr 11 09:28:15 2012 +0900
     2.9  @@ -367,11 +367,30 @@
    2.10       }
    2.11   
    2.12 @@ -36,7 +36,7 @@
    2.13     Thread *current = Current ();
    2.14  diff -r e503e546d382 model/dce-manager.cc
    2.15  --- a/model/dce-manager.cc	Mon Apr 09 10:03:33 2012 +0900
    2.16 -+++ b/model/dce-manager.cc	Wed Apr 11 00:10:58 2012 +0900
    2.17 ++++ b/model/dce-manager.cc	Wed Apr 11 09:28:15 2012 +0900
    2.18  @@ -1096,6 +1096,22 @@
    2.19             libpthread_setup = (void (*)(const struct Libc *))(symbol);
    2.20             libpthread_setup (libc);
    2.21 @@ -62,7 +62,7 @@
    2.22   
    2.23  diff -r e503e546d382 model/dce-poll.cc
    2.24  --- a/model/dce-poll.cc	Mon Apr 09 10:03:33 2012 +0900
    2.25 -+++ b/model/dce-poll.cc	Wed Apr 11 00:10:58 2012 +0900
    2.26 ++++ b/model/dce-poll.cc	Wed Apr 11 09:28:15 2012 +0900
    2.27  @@ -180,7 +180,12 @@
    2.28           }
    2.29       }
    2.30 @@ -79,7 +79,7 @@
    2.31         return -1;
    2.32  diff -r e503e546d382 model/dce-signal.cc
    2.33  --- a/model/dce-signal.cc	Mon Apr 09 10:03:33 2012 +0900
    2.34 -+++ b/model/dce-signal.cc	Wed Apr 11 00:10:58 2012 +0900
    2.35 ++++ b/model/dce-signal.cc	Wed Apr 11 09:28:15 2012 +0900
    2.36  @@ -3,6 +3,7 @@
    2.37   #include "process.h"
    2.38   #include "ns3/log.h"
    2.39 @@ -109,7 +109,7 @@
    2.40     Thread *current = Current ();
    2.41  diff -r e503e546d382 model/dce-signal.h
    2.42  --- a/model/dce-signal.h	Mon Apr 09 10:03:33 2012 +0900
    2.43 -+++ b/model/dce-signal.h	Wed Apr 11 00:10:58 2012 +0900
    2.44 ++++ b/model/dce-signal.h	Wed Apr 11 09:28:15 2012 +0900
    2.45  @@ -17,6 +17,7 @@
    2.46   int dce_pthread_kill (pthread_t thread, int sig);
    2.47   void dce_abort ();
    2.48 @@ -120,7 +120,7 @@
    2.49   }
    2.50  diff -r e503e546d382 model/dce-time.cc
    2.51  --- a/model/dce-time.cc	Mon Apr 09 10:03:33 2012 +0900
    2.52 -+++ b/model/dce-time.cc	Wed Apr 11 00:10:58 2012 +0900
    2.53 ++++ b/model/dce-time.cc	Wed Apr 11 09:28:15 2012 +0900
    2.54  @@ -54,3 +54,12 @@
    2.55   
    2.56     return asctime_r (tm, Current ()->process->asctime_result);
    2.57 @@ -136,7 +136,7 @@
    2.58  +}
    2.59  diff -r e503e546d382 model/dce-time.h
    2.60  --- a/model/dce-time.h	Mon Apr 09 10:03:33 2012 +0900
    2.61 -+++ b/model/dce-time.h	Wed Apr 11 00:10:58 2012 +0900
    2.62 ++++ b/model/dce-time.h	Wed Apr 11 09:28:15 2012 +0900
    2.63  @@ -3,6 +3,7 @@
    2.64   
    2.65   #include "sys/dce-time.h"
    2.66 @@ -156,7 +156,7 @@
    2.67   }
    2.68  diff -r e503e546d382 model/dce.cc
    2.69  --- a/model/dce.cc	Mon Apr 09 10:03:33 2012 +0900
    2.70 -+++ b/model/dce.cc	Wed Apr 11 00:10:58 2012 +0900
    2.71 ++++ b/model/dce.cc	Wed Apr 11 09:28:15 2012 +0900
    2.72  @@ -22,6 +22,8 @@
    2.73   #include <getopt.h>
    2.74   #include <limits.h>
    2.75 @@ -268,7 +268,7 @@
    2.76   {
    2.77  diff -r e503e546d382 model/elf-cache.cc
    2.78  --- a/model/elf-cache.cc	Mon Apr 09 10:03:33 2012 +0900
    2.79 -+++ b/model/elf-cache.cc	Wed Apr 11 00:10:58 2012 +0900
    2.80 ++++ b/model/elf-cache.cc	Wed Apr 11 09:28:15 2012 +0900
    2.81  @@ -26,6 +26,9 @@
    2.82     overriden.from = "libpthread.so.0";
    2.83     overriden.to = "libpthread-ns3.so";
    2.84 @@ -281,7 +281,7 @@
    2.85   std::string
    2.86  diff -r e503e546d382 model/libc-dce.cc
    2.87  --- a/model/libc-dce.cc	Mon Apr 09 10:03:33 2012 +0900
    2.88 -+++ b/model/libc-dce.cc	Wed Apr 11 00:10:58 2012 +0900
    2.89 ++++ b/model/libc-dce.cc	Wed Apr 11 09:28:15 2012 +0900
    2.90  @@ -52,6 +52,7 @@
    2.91   #include <netdb.h>
    2.92   #include <net/if.h>
    2.93 @@ -292,7 +292,7 @@
    2.94   #include <signal.h>
    2.95  diff -r e503e546d382 model/libc-ns3.h
    2.96  --- a/model/libc-ns3.h	Mon Apr 09 10:03:33 2012 +0900
    2.97 -+++ b/model/libc-ns3.h	Wed Apr 11 00:10:58 2012 +0900
    2.98 ++++ b/model/libc-ns3.h	Wed Apr 11 09:28:15 2012 +0900
    2.99  @@ -73,6 +73,7 @@
   2.100   NATIVE (ntohl)
   2.101   NATIVE (ntohs)
   2.102 @@ -369,7 +369,7 @@
   2.103   NATIVE (__sigsetjmp)
   2.104  diff -r e503e546d382 model/librt-ns3.version
   2.105  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   2.106 -+++ b/model/librt-ns3.version	Wed Apr 11 00:10:58 2012 +0900
   2.107 ++++ b/model/librt-ns3.version	Wed Apr 11 09:28:15 2012 +0900
   2.108  @@ -0,0 +1,4 @@
   2.109  +NS3 {
   2.110  +global:
   2.111 @@ -377,19 +377,26 @@
   2.112  +};
   2.113  diff -r e503e546d382 model/linux-socket-fd-factory.cc
   2.114  --- a/model/linux-socket-fd-factory.cc	Mon Apr 09 10:03:33 2012 +0900
   2.115 -+++ b/model/linux-socket-fd-factory.cc	Wed Apr 11 00:10:58 2012 +0900
   2.116 -@@ -537,6 +537,8 @@
   2.117 ++++ b/model/linux-socket-fd-factory.cc	Wed Apr 11 09:28:15 2012 +0900
   2.118 +@@ -464,6 +464,7 @@
   2.119 + void
   2.120 + LinuxSocketFdFactory::SetTask (std::string path, std::string value)
   2.121 + {
   2.122 ++  NS_LOG_FUNCTION (path << value);
   2.123 +   std::vector<std::pair<std::string,struct SimSysFile *> > files = GetSysFileList ();
   2.124 +   for (uint32_t i = 0; i < files.size (); i++)
   2.125 +     {
   2.126 +@@ -537,6 +538,7 @@
   2.127                                                         this));
   2.128     Set (".net.ipv4.conf.all.forwarding", "1");
   2.129     Set (".net.ipv4.conf.all.log_martians", "1");
   2.130 -+  Set (".net.ipv6.conf.all.forwarding", "1");
   2.131 -+  Set (".net.ipv6.conf.all.proxy_ndp", "1");
   2.132 ++  Set (".net.ipv6.conf.all.forwarding", "0");
   2.133   
   2.134     while (!m_earlySysfs.empty ())
   2.135       {
   2.136  diff -r e503e546d382 model/linux-socket-fd.cc
   2.137  --- a/model/linux-socket-fd.cc	Mon Apr 09 10:03:33 2012 +0900
   2.138 -+++ b/model/linux-socket-fd.cc	Wed Apr 11 00:10:58 2012 +0900
   2.139 ++++ b/model/linux-socket-fd.cc	Wed Apr 11 09:28:15 2012 +0900
   2.140  @@ -177,6 +177,7 @@
   2.141         return 0;
   2.142         break;
   2.143 @@ -400,7 +407,7 @@
   2.144         return -1;
   2.145  diff -r e503e546d382 model/net/dce-if.h
   2.146  --- a/model/net/dce-if.h	Mon Apr 09 10:03:33 2012 +0900
   2.147 -+++ b/model/net/dce-if.h	Wed Apr 11 00:10:58 2012 +0900
   2.148 ++++ b/model/net/dce-if.h	Wed Apr 11 09:28:15 2012 +0900
   2.149  @@ -7,6 +7,7 @@
   2.150   #endif
   2.151   
   2.152 @@ -411,7 +418,7 @@
   2.153   #ifdef __cplusplus
   2.154  diff -r e503e546d382 model/ns3-socket-fd-factory.cc
   2.155  --- a/model/ns3-socket-fd-factory.cc	Mon Apr 09 10:03:33 2012 +0900
   2.156 -+++ b/model/ns3-socket-fd-factory.cc	Wed Apr 11 00:10:58 2012 +0900
   2.157 ++++ b/model/ns3-socket-fd-factory.cc	Wed Apr 11 09:28:15 2012 +0900
   2.158  @@ -142,7 +142,8 @@
   2.159       }
   2.160     else
   2.161 @@ -424,7 +431,7 @@
   2.162     return socket;
   2.163  diff -r e503e546d382 model/sys/dce-socket.h
   2.164  --- a/model/sys/dce-socket.h	Mon Apr 09 10:03:33 2012 +0900
   2.165 -+++ b/model/sys/dce-socket.h	Wed Apr 11 00:10:58 2012 +0900
   2.166 ++++ b/model/sys/dce-socket.h	Wed Apr 11 09:28:15 2012 +0900
   2.167  @@ -28,6 +28,7 @@
   2.168   ssize_t dce_sendmsg(int s, const struct msghdr *msg, int flags);
   2.169   int dce_getsockname(int s, struct sockaddr *name, socklen_t *namelen);
   2.170 @@ -435,7 +442,7 @@
   2.171   }
   2.172  diff -r e503e546d382 wscript
   2.173  --- a/wscript	Mon Apr 09 10:03:33 2012 +0900
   2.174 -+++ b/wscript	Wed Apr 11 00:10:58 2012 +0900
   2.175 ++++ b/wscript	Wed Apr 11 09:28:15 2012 +0900
   2.176  @@ -26,7 +26,7 @@
   2.177       ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)
   2.178       ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)