Renamed ConfigFiles to TestSpecs

Signed-off-by: George Milescu <george.milescu@gmail.com>

diff --git a/ControlScripts/clients/hrk/start_hrk_leecher.sh b/ControlScripts/clients/hrk/start_hrk_leecher.sh
index 69265b0..ece7307 100755 (executable)
--- a/ControlScripts/clients/hrk/start_hrk_leecher.sh
+++ b/ControlScripts/clients/hrk/start_hrk_leecher.sh
@@ -14,10 +14,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/hrk/start_hrk_seeder.sh b/ControlScripts/clients/hrk/start_hrk_seeder.sh
index 7d979cf..0418677 100755 (executable)
--- a/ControlScripts/clients/hrk/start_hrk_seeder.sh
+++ b/ControlScripts/clients/hrk/start_hrk_seeder.sh
@@ -14,10 +14,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/tribler/start_tribler_doe.sh b/ControlScripts/clients/tribler/start_tribler_doe.sh
index ff14157..bf28ed3 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_doe.sh
+++ b/ControlScripts/clients/tribler/start_tribler_doe.sh
@@ -13,10 +13,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/tribler/start_tribler_leecher.sh b/ControlScripts/clients/tribler/start_tribler_leecher.sh
index 1c38bee..9f9c37e 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_leecher.sh
+++ b/ControlScripts/clients/tribler/start_tribler_leecher.sh
@@ -14,10 +14,10 @@
 # Read the global configuration file
 # Check if the global configuration file exists
 echo "pwd=$(pwd)"
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/tribler/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh
index 2cd8cbb..55c3725 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_proxy.sh
+++ b/ControlScripts/clients/tribler/start_tribler_proxy.sh
@@ -21,10 +21,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file

diff --git a/ControlScripts/clients/tribler/start_tribler_seeder.sh b/ControlScripts/clients/tribler/start_tribler_seeder.sh
index b85ddf0..1cbb18c 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_seeder.sh
+++ b/ControlScripts/clients/tribler/start_tribler_seeder.sh
@@ -13,10 +13,10 @@
 # Read the global configuration file
 # Check if the global configuration file exists
 echo "pwd=$(pwd)"
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/detect_complete_client.sh b/ControlScripts/detect_complete_client.sh
index 972dc3c..12a6f05 100755 (executable)
--- a/ControlScripts/detect_complete_client.sh
+++ b/ControlScripts/detect_complete_client.sh
@@ -18,10 +18,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file (CLIENT_TYPE)
@@ -34,10 +34,10 @@ fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../ConfigFiles/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../ConfigFiles/client_script_mappings does not exist."
+if [ ! -e ../TestSpecs/client_script_mappings ]; then
+       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
 else
-       source ../ConfigFiles/client_script_mappings
+       source ../TestSpecs/client_script_mappings
 fi
 
 log_file=$1

diff --git a/ControlScripts/parse_client_log.sh b/ControlScripts/parse_client_log.sh
index b450408..4989a6f 100755 (executable)
--- a/ControlScripts/parse_client_log.sh
+++ b/ControlScripts/parse_client_log.sh
@@ -18,18 +18,18 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../ConfigFiles/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../ConfigFiles/client_script_mappings does not exist."
+if [ ! -e ../TestSpecs/client_script_mappings ]; then
+       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
 else
-       source ../ConfigFiles/client_script_mappings
+       source ../TestSpecs/client_script_mappings
 fi
 
 client_type=$1

diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh
index 676e9ed..3f03b30 100755 (executable)
--- a/ControlScripts/run_campaign.sh
+++ b/ControlScripts/run_campaign.sh
@@ -19,10 +19,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read arguments

diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh
index c3b17a7..64bc814 100755 (executable)
--- a/ControlScripts/run_scenario.sh
+++ b/ControlScripts/run_scenario.sh
@@ -39,10 +39,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read arguments

diff --git a/ControlScripts/schedule_client.sh b/ControlScripts/schedule_client.sh
index 9c3fe63..948996e 100755 (executable)
--- a/ControlScripts/schedule_client.sh
+++ b/ControlScripts/schedule_client.sh
@@ -12,10 +12,10 @@ _DEBUG="off"
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration file
@@ -28,10 +28,10 @@ fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../ConfigFiles/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../ConfigFiles/client_script_mappings does not exist."
+if [ ! -e ../TestSpecs/client_script_mappings ]; then
+       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
 else
-       source ../ConfigFiles/client_script_mappings
+       source ../TestSpecs/client_script_mappings
 fi
 
 client_pid=0

diff --git a/ControlScripts/start_tracker.sh b/ControlScripts/start_tracker.sh
index c1f2450..bb9e8ae 100755 (executable)
--- a/ControlScripts/start_tracker.sh
+++ b/ControlScripts/start_tracker.sh
@@ -9,10 +9,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 export PYTHONPATH=$PYTHONPATH:.

diff --git a/ControlScripts/stop_client.sh b/ControlScripts/stop_client.sh
index d4d7b3f..8bb41b5 100755 (executable)
--- a/ControlScripts/stop_client.sh
+++ b/ControlScripts/stop_client.sh
@@ -12,10 +12,10 @@ _DEBUG="off"
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 # Read the node-specific configuration (CLIENT_TYPE)
@@ -28,10 +28,10 @@ fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../ConfigFiles/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../ConfigFiles/client_script_mappings does not exist."
+if [ ! -e ../TestSpecs/client_script_mappings ]; then
+       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
 else
-       source ../ConfigFiles/client_script_mappings
+       source ../TestSpecs/client_script_mappings
 fi
 
 stop_client ${CLIENT_TYPE}

diff --git a/ConfigFiles/.gitignore b/TestSpecs/.gitignore
similarity index 100%
rename from ConfigFiles/.gitignore
rename to TestSpecs/.gitignore

diff --git a/ConfigFiles/campaign01.cfg b/TestSpecs/campaign01.cfg
similarity index 100%
rename from ConfigFiles/campaign01.cfg
rename to TestSpecs/campaign01.cfg

diff --git a/ConfigFiles/campaign01.html b/TestSpecs/campaign01.html
similarity index 100%
rename from ConfigFiles/campaign01.html
rename to TestSpecs/campaign01.html

diff --git a/ConfigFiles/campaign02.cfg b/TestSpecs/campaign02.cfg
similarity index 100%
rename from ConfigFiles/campaign02.cfg
rename to TestSpecs/campaign02.cfg

diff --git a/ConfigFiles/campaign02.html b/TestSpecs/campaign02.html
similarity index 100%
rename from ConfigFiles/campaign02.html
rename to TestSpecs/campaign02.html

diff --git a/ConfigFiles/client_script_mappings b/TestSpecs/client_script_mappings
similarity index 100%
rename from ConfigFiles/client_script_mappings
rename to TestSpecs/client_script_mappings

diff --git a/ConfigFiles/globalconfig b/TestSpecs/globalconfig
similarity index 98%
rename from ConfigFiles/globalconfig
rename to TestSpecs/globalconfig
index 9bf948b..ab847a4 100644 (file)
--- a/ConfigFiles/globalconfig
+++ b/TestSpecs/globalconfig
@@ -38,7 +38,7 @@ WORKING_FOLDER_REL_PATH="../../P2P-Testing-Infrastructure/ClientWorkingFolders"
 BITTORNADO_REL_PATH="../../BTclients/BitTornado/BitTornado-CVS"
 
 # CONFIG_FILES_REL_PATH is relative to ControlScripts folder - used by run_scenario.sh
-CONFIG_FILES_REL_PATH="../ConfigFiles"
+CONFIG_FILES_REL_PATH="../TestSpecs"
 
 # CONFIG_FILES_REL_PATH is relative to ControlScripts folder - used by run_campaign.sh
 RESULTS_FOLDER_REL_PATH="../Results"

diff --git a/ConfigFiles/scenario01.cfg b/TestSpecs/scenario01.cfg
similarity index 100%
rename from ConfigFiles/scenario01.cfg
rename to TestSpecs/scenario01.cfg

diff --git a/ConfigFiles/scenario01.r b/TestSpecs/scenario01.r
similarity index 100%
rename from ConfigFiles/scenario01.r
rename to TestSpecs/scenario01.r

diff --git a/ConfigFiles/scenario02.cfg b/TestSpecs/scenario02.cfg
similarity index 100%
rename from ConfigFiles/scenario02.cfg
rename to TestSpecs/scenario02.cfg

diff --git a/ConfigFiles/scenario02.r b/TestSpecs/scenario02.r
similarity index 100%
rename from ConfigFiles/scenario02.r
rename to TestSpecs/scenario02.r

diff --git a/ConfigFiles/scenario03.cfg b/TestSpecs/scenario03.cfg
similarity index 100%
rename from ConfigFiles/scenario03.cfg
rename to TestSpecs/scenario03.cfg

diff --git a/ConfigFiles/scenario03.r b/TestSpecs/scenario03.r
similarity index 100%
rename from ConfigFiles/scenario03.r
rename to TestSpecs/scenario03.r

diff --git a/ConfigFiles/scenario04.cfg b/TestSpecs/scenario04.cfg
similarity index 100%
rename from ConfigFiles/scenario04.cfg
rename to TestSpecs/scenario04.cfg

diff --git a/ConfigFiles/scenario04.r b/TestSpecs/scenario04.r
similarity index 100%
rename from ConfigFiles/scenario04.r
rename to TestSpecs/scenario04.r

diff --git a/ConfigFiles/scenario05.cfg b/TestSpecs/scenario05.cfg
similarity index 100%
rename from ConfigFiles/scenario05.cfg
rename to TestSpecs/scenario05.cfg

diff --git a/ConfigFiles/scenario05.r b/TestSpecs/scenario05.r
similarity index 100%
rename from ConfigFiles/scenario05.r
rename to TestSpecs/scenario05.r

diff --git a/ConfigFiles/scenario06.cfg b/TestSpecs/scenario06.cfg
similarity index 100%
rename from ConfigFiles/scenario06.cfg
rename to TestSpecs/scenario06.cfg

diff --git a/ConfigFiles/scenario06.r b/TestSpecs/scenario06.r
similarity index 100%
rename from ConfigFiles/scenario06.r
rename to TestSpecs/scenario06.r

diff --git a/ConfigFiles/scenario07.cfg b/TestSpecs/scenario07.cfg
similarity index 100%
rename from ConfigFiles/scenario07.cfg
rename to TestSpecs/scenario07.cfg

diff --git a/ConfigFiles/scenario07.r b/TestSpecs/scenario07.r
similarity index 100%
rename from ConfigFiles/scenario07.r
rename to TestSpecs/scenario07.r

diff --git a/ConfigFiles/scenario08.cfg b/TestSpecs/scenario08.cfg
similarity index 100%
rename from ConfigFiles/scenario08.cfg
rename to TestSpecs/scenario08.cfg

diff --git a/ConfigFiles/scenario08.r b/TestSpecs/scenario08.r
similarity index 100%
rename from ConfigFiles/scenario08.r
rename to TestSpecs/scenario08.r

diff --git a/ConfigFiles/scenario09.cfg b/TestSpecs/scenario09.cfg
similarity index 100%
rename from ConfigFiles/scenario09.cfg
rename to TestSpecs/scenario09.cfg

diff --git a/ConfigFiles/scenario09.r b/TestSpecs/scenario09.r
similarity index 100%
rename from ConfigFiles/scenario09.r
rename to TestSpecs/scenario09.r

diff --git a/ConfigFiles/scenario101ct.cfg b/TestSpecs/scenario101ct.cfg
similarity index 100%
rename from ConfigFiles/scenario101ct.cfg
rename to TestSpecs/scenario101ct.cfg

diff --git a/ConfigFiles/scenario101ct.r b/TestSpecs/scenario101ct.r
similarity index 100%
rename from ConfigFiles/scenario101ct.r
rename to TestSpecs/scenario101ct.r

diff --git a/ConfigFiles/scenario102ct.cfg b/TestSpecs/scenario102ct.cfg
similarity index 100%
rename from ConfigFiles/scenario102ct.cfg
rename to TestSpecs/scenario102ct.cfg

diff --git a/ConfigFiles/scenario102ct.r b/TestSpecs/scenario102ct.r
similarity index 100%
rename from ConfigFiles/scenario102ct.r
rename to TestSpecs/scenario102ct.r

diff --git a/ConfigFiles/test-campaign.cfg b/TestSpecs/test-campaign.cfg
similarity index 100%
rename from ConfigFiles/test-campaign.cfg
rename to TestSpecs/test-campaign.cfg

diff --git a/ConfigFiles/test-campaign.html b/TestSpecs/test-campaign.html
similarity index 100%
rename from ConfigFiles/test-campaign.html
rename to TestSpecs/test-campaign.html

diff --git a/ConfigFiles/test-scenario-pre-post-nop.cfg b/TestSpecs/test-scenario-pre-post-nop.cfg
similarity index 100%
rename from ConfigFiles/test-scenario-pre-post-nop.cfg
rename to TestSpecs/test-scenario-pre-post-nop.cfg

diff --git a/ConfigFiles/test-scenario-pre-post-nop.r b/TestSpecs/test-scenario-pre-post-nop.r
similarity index 100%
rename from ConfigFiles/test-scenario-pre-post-nop.r
rename to TestSpecs/test-scenario-pre-post-nop.r

diff --git a/ConfigFiles/test-scenario-pre-post.cfg b/TestSpecs/test-scenario-pre-post.cfg
similarity index 100%
rename from ConfigFiles/test-scenario-pre-post.cfg
rename to TestSpecs/test-scenario-pre-post.cfg

diff --git a/ConfigFiles/test-scenario-pre-post.r b/TestSpecs/test-scenario-pre-post.r
similarity index 100%
rename from ConfigFiles/test-scenario-pre-post.r
rename to TestSpecs/test-scenario-pre-post.r

diff --git a/Utils/grep_search.sh b/Utils/grep_search.sh
index 04755e7..c8242f2 100755 (executable)
--- a/Utils/grep_search.sh
+++ b/Utils/grep_search.sh
@@ -13,10 +13,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 cd $TRIBLER_UTIL_REL_PATH

diff --git a/Utils/show_version.sh b/Utils/show_version.sh
index dd3e962..327a9ca 100755 (executable)
--- a/Utils/show_version.sh
+++ b/Utils/show_version.sh
@@ -9,10 +9,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 export PYTHONPATH=$PYTHONPATH:.

diff --git a/Utils/start_tribler_gui.sh b/Utils/start_tribler_gui.sh
index 74e879b..5268d14 100755 (executable)
--- a/Utils/start_tribler_gui.sh
+++ b/Utils/start_tribler_gui.sh
@@ -9,10 +9,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../../../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../../../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../../../TestSpecs/globalconfig does not exist."
 else
-       source ../../../ConfigFiles/globalconfig
+       source ../../../TestSpecs/globalconfig
 fi
 
 export PYTHONPATH=$PYTHONPATH:.

diff --git a/Utils/sync_cluster.sh b/Utils/sync_cluster.sh
index 3e67e7d..39df36f 100755 (executable)
--- a/Utils/sync_cluster.sh
+++ b/Utils/sync_cluster.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH p2p@p2p-next-01.grid.pub.ro:/home/p2p/george/P2P-Next

diff --git a/Utils/sync_cluster_containers.sh b/Utils/sync_cluster_containers.sh
index d82bd91..20bbac2 100755 (executable)
--- a/Utils/sync_cluster_containers.sh
+++ b/Utils/sync_cluster_containers.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 for host in p2p-next-01.grid.pub.ro p2p-next-03.grid.pub.ro p2p-next-04.grid.pub.ro p2p-next-05.grid.pub.ro p2p-next-06.grid.pub.ro p2p-next-07.grid.pub.ro p2p-next-08.grid.pub.ro p2p-next-09.grid.pub.ro p2p-next-10.grid.pub.ro; do

diff --git a/Utils/sync_kth.sh b/Utils/sync_kth.sh
index eb34a3b..c264257 100755 (executable)
--- a/Utils/sync_kth.sh
+++ b/Utils/sync_kth.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@p2p-next.xen.ssvl.kth.se:/home/george/P2P-Next

diff --git a/Utils/sync_single_cluster_container.sh b/Utils/sync_single_cluster_container.sh
index 6197d72..f2a2365 100755 (executable)
--- a/Utils/sync_single_cluster_container.sh
+++ b/Utils/sync_single_cluster_container.sh
@@ -10,10 +10,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 host=$1

diff --git a/Utils/sync_single_cluster_container_scripts.sh b/Utils/sync_single_cluster_container_scripts.sh
index c167310..b857312 100755 (executable)
--- a/Utils/sync_single_cluster_container_scripts.sh
+++ b/Utils/sync_single_cluster_container_scripts.sh
@@ -10,10 +10,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 host=$1
@@ -21,4 +21,4 @@ port=$2
 
 echo "Syncing $host $port"
 rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/ControlScripts p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null
-rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/ConfigFiles p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null
+rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/TestSpecs p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null

diff --git a/Utils/sync_swarm.cs.pub.ro.sh b/Utils/sync_swarm.cs.pub.ro.sh
index 698aff7..048befa 100755 (executable)
--- a/Utils/sync_swarm.cs.pub.ro.sh
+++ b/Utils/sync_swarm.cs.pub.ro.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@swarm.cs.pub.ro:/home/george/P2P-Next

diff --git a/Utils/sync_vm.sh b/Utils/sync_vm.sh
index 81d4478..757115e 100755 (executable)
--- a/Utils/sync_vm.sh
+++ b/Utils/sync_vm.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../ConfigFiles/globalconfig ]; then
-       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+if [ ! -e ../TestSpecs/globalconfig ]; then
+       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
 else
-       source ../ConfigFiles/globalconfig
+       source ../TestSpecs/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@tracker.local:/home/george/P2P-Next