Mercurial Mercurial > tomh > ns-3-dev-spectrum-wifi / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test.py
changeset 6642 072bfb97e87c
parent 6635 d52752c85699
child 6699 d8909a1fd0ff 
--- a/test.py	Mon Oct 25 22:21:50 2010 +0100
+++ b/test.py	Mon Oct 25 22:47:46 2010 +0100
@@ -89,95 +89,95 @@
 # hardcoded.
 #
 example_tests = [
-    ("csma/csma-bridge", "True", "True"),
-    ("csma/csma-bridge-one-hop", "True", "True"),
-    ("csma/csma-broadcast", "True", "True"),
-    ("csma/csma-multicast", "True", "True"),
-    ("csma/csma-one-subnet", "True", "True"),
-    ("csma/csma-packet-socket", "True", "True"),
-    ("csma/csma-ping", "True", "True"),
-    ("csma/csma-raw-ip-socket", "True", "True"),
-    ("csma/csma-star", "True", "True"),
+    ("src/devices/bridge/examples/csma-bridge", "True", "True"),
+    ("src/devices/bridge/examples/csma-bridge-one-hop", "True", "True"),
+    ("examples/csma/csma-broadcast", "True", "True"),
+    ("examples/csma/csma-multicast", "True", "True"),
+    ("examples/csma/csma-one-subnet", "True", "True"),
+    ("examples/csma/csma-packet-socket", "True", "True"),
+    ("examples/csma/csma-ping", "True", "True"),
+    ("examples/csma/csma-raw-ip-socket", "True", "True"),
+    ("examples/csma/csma-star", "True", "True"),
 
-    ("emulation/emu-ping", "False", "True"),
-    ("emulation/emu-udp-echo", "False", "True"),
+    ("examples/emulation/emu-ping", "False", "True"),
+    ("examples/emulation/emu-udp-echo", "False", "True"),
 
-    ("error-model/simple-error-model", "True", "True"),
+    ("examples/error-model/simple-error-model", "True", "True"),
 
-    ("ipv6/icmpv6-redirect", "True", "True"),
-    ("ipv6/ping6", "True", "True"),
-    ("ipv6/radvd", "True", "True"),
-    ("ipv6/radvd-two-prefix", "True", "True"),    
-    ("ipv6/test-ipv6", "True", "True"),
+    ("examples/ipv6/icmpv6-redirect", "True", "True"),
+    ("examples/ipv6/ping6", "True", "True"),
+    ("examples/ipv6/radvd", "True", "True"),
+    ("examples/ipv6/radvd-two-prefix", "True", "True"),    
+    ("examples/ipv6/test-ipv6", "True", "True"),
 
-    ("mesh/mesh", "True", "True"),
+    ("examples/mesh/mesh", "True", "True"),
 
-    ("naming/object-names", "True", "True"),
+    ("examples/naming/object-names", "True", "True"),
 
-    ("realtime/realtime-udp-echo", "ENABLE_REAL_TIME == True", "True"),
+    ("examples/realtime/realtime-udp-echo", "ENABLE_REAL_TIME == True", "True"),
 
-    ("routing/dynamic-global-routing", "True", "True"),
-    ("routing/global-injection-slash32", "True", "True"),
-    ("routing/global-routing-slash32", "True", "True"),
-    ("routing/mixed-global-routing", "True", "True"),
-    ("routing/nix-simple", "True", "True"),
-    ("routing/nms-p2p-nix", "False", "True"), # Takes too long to run
-    ("routing/simple-alternate-routing", "True", "True"),
-    ("routing/simple-global-routing", "True", "True"),
-    ("routing/simple-point-to-point-olsr", "True", "True"),
-    ("routing/simple-routing-ping6", "True", "True"),
-    ("routing/static-routing-slash32", "True", "True"),
-    ("routing/aodv", "True", "True"),
+    ("examples/routing/dynamic-global-routing", "True", "True"),
+    ("examples/routing/global-injection-slash32", "True", "True"),
+    ("examples/routing/global-routing-slash32", "True", "True"),
+    ("examples/routing/mixed-global-routing", "True", "True"),
+    ("examples/routing/nix-simple", "True", "True"),
+    ("examples/routing/nms-p2p-nix", "False", "True"), # Takes too long to run
+    ("examples/routing/simple-alternate-routing", "True", "True"),
+    ("examples/routing/simple-global-routing", "True", "True"),
+    ("src/routing/olsr/examples/simple-point-to-point-olsr", "True", "True"),
+    ("examples/routing/simple-routing-ping6", "True", "True"),
+    ("examples/routing/static-routing-slash32", "True", "True"),
+    ("examples/routing/aodv", "True", "True"),
 
-    ("spectrum/adhoc-aloha-ideal-phy", "True", "True"),
-    ("spectrum/adhoc-aloha-ideal-phy-with-microwave-oven", "True", "True"),
+    ("examples/spectrum/adhoc-aloha-ideal-phy", "True", "True"),
+    ("examples/spectrum/adhoc-aloha-ideal-phy-with-microwave-oven", "True", "True"),
 
-    ("stats/wifi-example-sim", "True", "True"),
+    ("examples/stats/wifi-example-sim", "True", "True"),
 
-    ("tap/tap-wifi-dumbbell", "False", "True"), # Requires manual configuration
+    ("examples/tap/tap-wifi-dumbbell", "False", "True"), # Requires manual configuration
 
-    ("tcp/star", "True", "True"),
-    ("tcp/tcp-large-transfer", "True", "True"),
-    ("tcp/tcp-nsc-lfn", "NSC_ENABLED == True", "False"),
-    ("tcp/tcp-nsc-zoo", "NSC_ENABLED == True", "False"),
-    ("tcp/tcp-star-server", "True", "True"),
+    ("examples/tcp/star", "True", "True"),
+    ("examples/tcp/tcp-large-transfer", "True", "True"),
+    ("examples/tcp/tcp-nsc-lfn", "NSC_ENABLED == True", "False"),
+    ("examples/tcp/tcp-nsc-zoo", "NSC_ENABLED == True", "False"),
+    ("examples/tcp/tcp-star-server", "True", "True"),
 
-    ("topology-read/topology-read --input=../../examples/topology-read/Inet_small_toposample.txt", "True", "True"),
-    ("topology-read/topology-read --format=Rocketfuel --input=../../examples/topology-read/RocketFuel_toposample_1239_weights.txt", "True", "True"),
+    ("examples/topology-read/topology-read --input=../../examples/topology-read/Inet_small_toposample.txt", "True", "True"),
+    ("examples/topology-read/topology-read --format=Rocketfuel --input=../../examples/topology-read/RocketFuel_toposample_1239_weights.txt", "True", "True"),
 
-    ("tunneling/virtual-net-device", "True", "True"),
+    ("src/devices/virtual-net-device/examples/virtual-net-device", "True", "True"),
 
-    ("tutorial/first", "True", "True"),
-    ("tutorial/hello-simulator", "True", "True"),
-    ("tutorial/second", "True", "True"),
-    ("tutorial/third", "True", "True"),
-    ("tutorial/fourth", "True", "True"),
-    ("tutorial/fifth", "True", "True"),
-    ("tutorial/sixth", "True", "True"),
+    ("examples/tutorial/first", "True", "True"),
+    ("examples/tutorial/hello-simulator", "True", "True"),
+    ("examples/tutorial/second", "True", "True"),
+    ("examples/tutorial/third", "True", "True"),
+    ("examples/tutorial/fourth", "True", "True"),
+    ("examples/tutorial/fifth", "True", "True"),
+    ("examples/tutorial/sixth", "True", "True"),
 
-    ("udp/udp-echo", "True", "True"),
+    ("examples/udp/udp-echo", "True", "True"),
 
-    ("wireless/mixed-wireless", "True", "True"),
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::AarfcdWifiManager", "True", "True"), 
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::AmrrWifiManager", "True", "True"), 
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::CaraWifiManager", "True", "True"), 
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::IdealWifiManager", "True", "True"), 
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager", "True", "True"), 
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::OnoeWifiManager", "True", "True"), 
-    ("wireless/multirate --totalTime=0.3s --rateManager=ns3::RraaWifiManager", "True", "True"), 
-    ("wireless/simple-wifi-frame-aggregation", "True", "True"),
-    ("wireless/wifi-adhoc", "False", "True"), # Takes too long to run
-    ("wireless/wifi-ap --verbose=0", "True", "True"), # Don't let it spew to stdout
-    ("wireless/wifi-clear-channel-cmu", "False", "True"), # Requires specific hardware
-    ("wireless/wifi-simple-adhoc", "True", "True"),
-    ("wireless/wifi-simple-adhoc-grid", "True", "True"),
-    ("wireless/wifi-simple-infra", "True", "True"),
-    ("wireless/wifi-simple-interference", "True", "True"),
-    ("wireless/wifi-wired-bridging", "True", "True"),
+    ("examples/wireless/mixed-wireless", "True", "True"),
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::AarfcdWifiManager", "True", "True"), 
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::AmrrWifiManager", "True", "True"), 
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::CaraWifiManager", "True", "True"), 
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::IdealWifiManager", "True", "True"), 
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager", "True", "True"), 
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::OnoeWifiManager", "True", "True"), 
+    ("examples/wireless/multirate --totalTime=0.3s --rateManager=ns3::RraaWifiManager", "True", "True"), 
+    ("examples/wireless/simple-wifi-frame-aggregation", "True", "True"),
+    ("examples/wireless/wifi-adhoc", "False", "True"), # Takes too long to run
+    ("examples/wireless/wifi-ap --verbose=0", "True", "True"), # Don't let it spew to stdout
+    ("examples/wireless/wifi-clear-channel-cmu", "False", "True"), # Requires specific hardware
+    ("examples/wireless/wifi-simple-adhoc", "True", "True"),
+    ("examples/wireless/wifi-simple-adhoc-grid", "True", "True"),
+    ("examples/wireless/wifi-simple-infra", "True", "True"),
+    ("examples/wireless/wifi-simple-interference", "True", "True"),
+    ("examples/wireless/wifi-wired-bridging", "True", "True"),
 
-    ("wimax/wimax-simple", "True", "True"),
-    ("wimax/wimax-ipv4", "True", "True"),
-    ("wimax/wimax-multicast", "True", "True"),
+    ("examples/wimax/wimax-simple", "True", "True"),
+    ("examples/wimax/wimax-ipv4", "True", "True"),
+    ("examples/wimax/wimax-multicast", "True", "True"),
 ]
 
 #
@@ -191,7 +191,7 @@
 python_tests = [
     ("src/devices/bridge/examples/csma-bridge.py", "True"),
 
-    ("src/contrib/flowmon/examples/wifi-olsr-flowmon.py", "True"),
+    ("src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py", "True"),
 
     ("examples/routing/simple-routing-ping6.py", "True"),
 
@@ -1285,7 +1285,7 @@
                         job.set_cwd(testpy_output_dir)
                         job.set_basedir(os.getcwd())
                         job.set_tempdir(testpy_output_dir)
-                        job.set_shell_command("examples/%s" % test)
+                        job.set_shell_command(test)
 
                         if options.valgrind and not eval(do_valgrind_run):
                             job.set_is_skip (True)
tomh/ns-3-dev-spectrum-wifi