minor fixes in fingerprint and smoke tests

.gitignore

@@ -36,6 +36,7 @@ precompiled_*.h.*
 .buildlog*
 
 # ignore binary files
+src/OverSim*
 out/
 *.so
 *.dylib

Makefile

@@ -36,14 +36,14 @@ doxy:
 	doxygen doxy.cfg
 
 verify:
-	cd simulations && ../src/OverSim -fverify.ini -cChord | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cKoorde | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cKademlia | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cBroose | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cPastry | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cBamboo | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cKademliaInet | grep Fingerprint
-	cd simulations && ../src/OverSim -fverify.ini -cChordSource | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cChord | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cKoorde | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cKademlia | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cBroose | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cPastry | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cBamboo | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cKademliaInet | grep Fingerprint
+	cd simulations && ../src/OverSim_dbg -fverify.ini -cChordSource | grep Fingerprint
 
 dist: makefiles
 	cd src && $(MAKE) MODE=release

simulations/verify.ini

@@ -15,41 +15,41 @@ debug-on-errors = true
 
 [Config Chord]
 **.overlayType = "ChordModules"
-fingerprint = "a7d9-6782" # debug, release
+fingerprint = "d005-4311/tplx" # debug, release
 
 [Config Koorde]
 **.overlayType = "KoordeModules"
-fingerprint = "09ec-e4c2" # debug, release
+fingerprint = "26b3-59db/tplx" # debug, release
 
 [Config Kademlia]
 **.overlayType = "KademliaModules"
-fingerprint = "c462-5c95" # debug, release
+fingerprint = "1d0f-4ee8/tplx" # debug, release
 
 [Config Broose]
 **.overlayType = "BrooseModules"
 **.numTiers = 1
 **.tier1Type = "oversim.applications.kbrtestapp.KBRTestAppModules"
-fingerprint = "3f57-b0e1" # debug, release
+fingerprint = "9748-9d37/tplx" # debug, release
 
 [Config Pastry]
 **.overlayType = "PastryModules"
 **.neighborCache.enableNeighborCache = true
-fingerprint = "cc13-d787" # debug, release
+fingerprint = "6055-f7de/tplx" # debug, release
 
 [Config Bamboo]
 **.overlayType = "BambooModules"
 **.neighborCache.enableNeighborCache = true
 **.overlay*.bamboo.numberOfLeaves = 16
-fingerprint = "8ed5-6712" # debug, release
+fingerprint = "afd3-58a9/tplx" # debug, release
 
 [Config KademliaInet]
 **.overlayType = "KademliaModules"
 network = oversim.underlay.inetunderlay.InetUnderlayNetwork
-fingerprint = "4a03-5dd4" # debug, release
+fingerprint = "4dac-b25b/tplx" # debug, release
 
 [Config ChordSource]
 **.overlayType = "ChordModules"
 **.overlay*.*.routingType = "source-routing-recursive"
-fingerprint = "ed61-48f5" # debug, release
+fingerprint = "a374-9983/tplx" # debug, release
 
 include ./default.ini

tests/smoke/simulations.csv

@@ -26,8 +26,8 @@
 /simulations/,                       -f omnetpp.ini -c i3Anycast -r 0
 /simulations/,                       -f omnetpp.ini -c Scribe -r 0
 /simulations/,                       -f omnetpp.ini -c Partition -r 0
-# /simulations/,                       -f omnetpp.ini -c ChurnVisualization -r 0     # FAILED: Condition '(oldTerminalCount - 1) == terminalCount' does not hold in function 'handleMessage' at common/RandomChurn.cc:114
-# /simulations/,                       -f omnetpp.ini -c MultiOverlay -r 0     # FAILED: Condition '(oldTerminalCount - 1) == terminalCount' does not hold in function 'handleMessage' at common/RandomChurn.cc:114
+/simulations/,                       -f omnetpp.ini -c ChurnVisualization -r 0
+/simulations/,                       -f omnetpp.ini -c MultiOverlay -r 0
 /simulations/,                       -f omnetpp.ini -c SimMud -r 0
 /simulations/,                       -f omnetpp.ini -c NTree -r 0
 /simulations/,                       -f omnetpp.ini -c PubSubMMOG -r 0