commit 325c2533aac4507780ce4c42c3b21d63c36e9e95
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 15:38:53 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 11 11:42:40 2016 -0700
tree c1f05281ed11642bb8d92294e1757ff9d45ec70e
parent 0167d58064af56b830ebe278fec551ea7eeff7ef

NFD+ndn-cxx: Update version of submodules

- NFD: based on NFD:commit:704430ca07bda92019538b92379c276529efa04a (NFD-0.4.1-1-g704430c)
- ndn-cxx: based on ndn-cxx:commit:2e52d7cab4e03631db7f6c89a2daf7de590dd29e (ndn-cxx-0.4.1)

Note that code compiles, because all ndnSIM code is disabled.  Future
commits re-enable ndnSIM features.

Change-Id: Iff7daad6372eaa719db5af110a842afdcc319978
Refs: #3560

tests/wscript

diff --git a/tests/wscript b/tests/wscript
index 26d020b..5bd65f4 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -6,14 +6,14 @@
 
     # Unit tests
     tests = bld.create_ns3_program('ndnSIM-unit-tests', all_modules)
-    tests.source = bld.path.ant_glob(['main.cpp', 'unit-tests/**/*.cpp'])
+    tests.source = bld.path.ant_glob(['main.cpp', 'unit-tests/**/*.cpp'],
+                                     excl=['unit-tests/*/**/*.cpp'])
     tests.includes = ['#', '.', '../NFD/', "../NFD/daemon", "../NFD/core", "../helper", "../model", "../apps", "../utils", "../examples"]
     tests.defines = 'TEST_CONFIG_PATH=\"%s/conf-test\"' %(bld.bldnode)
 
-    # Other tests
-    for i in bld.path.ant_glob(['other/*.cpp']):
-        name = str(i)[:-len(".cpp")]
-        obj = bld.create_ns3_program(name, all_modules)
-        obj.source = [i] + bld.path.ant_glob(['%s/**/*.cpp' % name])
-        obj.install_path = None
-
+    # # Other tests
+    # for i in bld.path.ant_glob(['other/*.cpp']):
+    #     name = str(i)[:-len(".cpp")]
+    #     obj = bld.create_ns3_program(name, all_modules)
+    #     obj.source = [i] + bld.path.ant_glob(['%s/**/*.cpp' % name])
+    #     obj.install_path = None