commit f326f9413c10bff8f229ef137175e89a0e6f6da4
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 17:17:05 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 11 12:55:32 2016 -0700
tree 1d45b31a93430f7a940610e5e0b22459646764d7
parent 50ea1a3fbaaec187338749bd6124bc28f7ac30e9

tests: Re-enable unit tests

Change-Id: Iaf79058506b66654a004dfe2ca32453f0c2c1695
Refs: #3560

tests/wscript

diff --git a/tests/wscript b/tests/wscript
index 5bd65f4..76996dc 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -6,14 +6,13 @@
 
     # Unit tests
     tests = bld.create_ns3_program('ndnSIM-unit-tests', all_modules)
-    tests.source = bld.path.ant_glob(['main.cpp', 'unit-tests/**/*.cpp'],
-                                     excl=['unit-tests/*/**/*.cpp'])
+    tests.source = bld.path.ant_glob(['main.cpp', '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