diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-04 12:45:21 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-04 12:45:21 -0800 |
| commit | ac8918992b647c80c6da4b7c0956fd383b15e9d7 (patch) | |
| tree | 67dbe17f61a99c89cf8e5ba8b5df435b007b288e /selftest.cpp | |
| parent | cbf8d9c45b1e09d55f426a2c1cbaa7b9e1830950 (diff) | |
| parent | a4cfe4cd1650ea7e9aada0b004fd7aade2e43ced (diff) | |
| download | infinitytier-ac8918992b647c80c6da4b7c0956fd383b15e9d7.tar.gz infinitytier-ac8918992b647c80c6da4b7c0956fd383b15e9d7.zip | |
Merge dev.
Diffstat (limited to 'selftest.cpp')
| -rw-r--r-- | selftest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/selftest.cpp b/selftest.cpp index e68f564c..4e9219b2 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -1096,7 +1096,7 @@ int main(int argc,char **argv) srand((unsigned int)time(0)); - /* + ///* r |= testSqliteNetworkController(); r |= testOther(); r |= testCrypto(); @@ -1106,17 +1106,19 @@ int main(int argc,char **argv) r |= testPhy(); r |= testResolver(); //r |= testHttp(); - */ + //*/ if (r) std::cout << std::endl << "SOMETHING FAILED!" << std::endl; + /* #ifdef ZT_USE_MINIUPNPC std::cout << std::endl; std::cout << "[portmapper] Starting port mapper and waiting forever... use CTRL+C to exit. (enable ZT_PORTMAPPER_TRACE in PortMapper.cpp for output)" << std::endl; PortMapper mapper(12345,"ZeroTier/__selftest"); Thread::sleep(0xffffffff); #endif + */ return r; } |