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 69265b04cec8cf3dbd9cf0f228c78521d531f72e..ece73077b590ab6afb5785173e88d26211a97bc2 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 7d979cf19349fa7c29ae67928b15a03a58217534..0418677d560ec6633940ef50f326e820ad7a06e2 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 ff1415746b864673f3e11d5bc6b3952812b2f5bc..bf28ed3aeda096859bed844eb8bdacefea5b843b 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 1c38bee7cd0931ae8a40c4ccdc54a0e6959f852a..9f9c37eb3479e99d43910dc0646798b98855c43f 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 2cd8cbb654c49ee8710eba369ee245d7138e19ff..55c372515e7172d1de66759eafc07075f31e0c18 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 b85ddf051e616cc3dd9906d0392eb5d0753ff657..1cbb18c985eb281c3ad6a4ea5d978ce4b40ccd24 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 972dc3c7e2d762fcdb162173adb3e3847b00c86f..12a6f059cc5af70f15d619790884fdf731fd91e9 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 b45040856c502d4f8928332b5caa959c8c22b53f..4989a6f6e0b908ecf60c6ca2da93d4de5b84620f 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 676e9ede75c5332b5c660bda6dd6814b8722ec85..3f03b309c5a87f2b34604d944c44f84412ba1f56 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 c3b17a7c457b046021b9d59019861fe8e1923851..64bc8145a55db0c81fa1b9b1a3dc9b871a6d5a69 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 9c3fe63ffd66f3c2cfa157e3ad553b30e61a5b61..948996eb02422153fdf79a26477be1a71802dbcb 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 c1f2450119fc856ae6532dc904c771b5b602f85c..bb9e8aee576a53ac80d346d5b4978b8852cc7c08 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 d4d7b3f3b4816ba802ba80b78b007de6e2856f70..8bb41b55a7886c2d1cbe127edc4267e3330cc165 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 9bf948b31bd7bde24b67226fd1a268c5da9d2c1d..ab847a4bf136bcc2bb66615869d0b4a47cd875c4 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 04755e795c7323fb221abfd3b03da5f454cb5a9e..c8242f292c4bbb3ade1d86327aded1360d925a9a 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 dd3e9625d60dcdd314a3cd205cb8175ad43241b0..327a9ca53d50fee46f036b70e205769f537e2aa2 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 74e879bf3c0adabf5416d9ecd2283e6d47b14584..5268d142549021e9b38c0b285eee776f363088e2 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 3e67e7d5f6c0208e458910bf7636d1420eca92ab..39df36f4de1e6e147fdbec87302aa6b5482a3e34 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 d82bd915c26556a2f88a8b0f9bad188719d29ac0..20bbac2a137cf0e082cf8369c00ed75217e8ff70 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 eb34a3bfa0a205ecc699e4ac5b1d19796fed441c..c264257c6a4ad3701bd098f63477d61f54941eee 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 6197d72a451f65b60afd47f7af533e9b0ffd921c..f2a2365c7ee5356529ddee5eb77f5689ba59b9d5 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 c1673100751da402e7ba861944c92d3a73f072ae..b857312f3a3fd19c2e7aa11e59ecbec82d2f322a 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 698aff786998e1f6c5784ccbd7be3ea809944c2e..048befa0d4743272399b66649e71cd1678cb4093 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 81d447838503cff15b0ae568242b5d4946b9c77f..757115e2f8067bfcf18c39d140e5032504a937fc 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