test_suite: use --config_root_dir option of start_test.sh

Now we can start single test cases *and* specify explicitly which *.conf
files are to be incorporated.

test_suite/build_test_environment/checkout.conf

@@ -19,6 +19,5 @@
 
 #####################################################################
 
-
-perftest_parallel_writer=0
-
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/build_test_environment/cluster.conf

@@ -19,6 +19,5 @@
 
 #####################################################################
 
-perftest_parallel_writer=1
-resource_fs_on_data_device_necessary=1
-
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/build_test_environment/install_mars.conf

@@ -19,6 +19,5 @@
 
 #####################################################################
 
-
-perftest_parallel_writer=0
-
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/build_test_environment/lv_config.conf

@@ -19,6 +19,5 @@
 
 #####################################################################
 
-perftest_parallel_writer=1
-resource_fs_on_data_device_necessary=1
-
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/build_test_environment/make.conf

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
+#
+# Email: frank.liepold@1und1.de
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/build_test_environment/resource.conf

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
+#
+# Email: frank.liepold@1und1.de
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/mars_test_cronjob.sh

@@ -45,10 +45,12 @@ function execute_tests
     local errorfile_grep_cmd='grep ERROR-FILE '$tmp_file
     local kernel_stack_grep_cmd='grep KERNEL-STACK '$tmp_file
 
-    for t in "${tests_to_execute[@]}"; do
+    for t in "${!tests_to_execute[@]}"; do
+        local config_root_dir=${tests_to_execute[$t]}
+        local config_root_dir_opt=${config_root_dir:+"--config_root_dir=$test_suite_dir/$config_root_dir"}
         echo executing test $t
         cd $test_suite_dir/$t || myexit 1
-        $start_script 2>&1 |  tee $tmp_file
+        $start_script $config_root_dir_opt 2>&1 |  tee $tmp_file
         rc=${PIPESTATUS[0]}
         if [ $rc -ne 0 ];then
             fail_msg+="$t"$'\n'
@@ -130,39 +132,45 @@ mail_to=("frank.liepold@1und1.de")
 
 start_script=$test_suite_dir/scripts/start_test.sh
 
-# test entries *must* start at begin of lines
+# key = test directory, value = directory serving as parameter for option
+# --config_root_dir of start_test.sh
+# all directory paths are given relative to test_suite_dir
 
+declare -A tests_to_execute
 tests_to_execute=(\
-build_test_environment/checkout \
-build_test_environment/make/make_mars/grub \
-build_test_environment/install_mars \
-build_test_environment/lv_config \
-build_test_environment/cluster \
-build_test_environment/resource/create_resource \
-test_cases/admin/apply_fetch/apply \
-test_cases/admin/apply_fetch/fetch \
-test_cases/destroy_secondary_logfile \
-test_cases/admin/resizing \
-test_cases/admin/logrotate \
-test_cases/admin/logdelete \
-test_cases/bugs/memleak \
-test_cases/admin/switch2primary \
-test_cases/admin/switch2primary_force \
-test_cases/admin/datadev_full \
-test_cases/hardcore/mars_dir_full/write_other_file \
-test_cases/hardcore/mars_dir_full/write_data_dev \
-test_cases/stabil/net_failure/connection_cut \
-test_cases/admin/three_nodes \
-test_cases/admin/switch2primary_force \
-test_cases/stabil/crash/crash_primary \
-test_cases/stabil/crash/crash_primary_logger_comletion_semantics__aio_sync_mode \
-test_cases/stabil/crash/crash_primary_logger_completion_semantics \
-test_cases/stabil/crash/crash_primary_aio_sync_mode \
-test_cases/bugs/aio_filehandle \
-build_test_environment/resource/leave_resource \
-test_cases/perf \
+["build_test_environment/checkout"]="build_test_environment" \
+["build_test_environment/make/make_mars/grub"]="build_test_environment" \
+["build_test_environment/install_mars"]="build_test_environment" \
+["build_test_environment/lv_config"]="build_test_environment" \
+["build_test_environment/cluster"]="build_test_environment" \
+["build_test_environment/resource/create_resource"]="build_test_environment" \
+["test_cases/admin/apply_fetch/apply"]="test_cases/admin" \
+["test_cases/admin/apply_fetch/fetch"]="test_cases/admin" \
+["test_cases/hardcore/destroy_secondary_logfile"]="test_cases/hardcore" \
+["test_cases/admin/resizing"]="test_cases/admin" \
+["test_cases/admin/logrotate"]="test_cases/admin" \
+["test_cases/admin/logdelete"]="test_cases/admin" \
+["test_cases/bugs/memleak"]="test_cases/bugs" \
+["test_cases/admin/switch2primary"]="test_cases/admin" \
+["test_cases/admin/switch2primary_force"]="test_cases/admin" \
+["test_cases/admin/datadev_full"]="test_cases/admin" \
+["test_cases/hardcore/mars_dir_full/write_other_file"]="test_cases/hardcore" \
+["test_cases/hardcore/mars_dir_full/write_data_dev"]="test_cases/hardcore" \
+["test_cases/stabil/net_failure/connection_cut"]="test_cases/stabil" \
+["test_cases/admin/three_nodes"]="test_cases/admin" \
+["test_cases/admin/switch2primary_force"]="test_cases/admin" \
+["test_cases/stabil/crash/crash_primary"]="test_cases/stabil" \
+["test_cases/stabil/crash/crash_primary_logger_comletion_semantics__aio_sync_mode"]="test_cases/stabil" \
+["test_cases/stabil/crash/crash_primary_logger_completion_semantics"]="test_cases/stabil" \
+["test_cases/stabil/crash/crash_primary_aio_sync_mode"]="test_cases/stabil" \
+["test_cases/bugs/aio_filehandle"]="test_cases/bugs" \
+["build_test_environment/resource/leave_resource"]="test_cases/admin" \
+["test_cases/perf"]="" \
 )
 
+tests_to_execute=(\
+["build_test_environment/resource/create_resource"]="build_test_environment" \
+)
 set_env
 
 execute_tests

test_suite/test_cases/admin.conf

@@ -17,3 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/admin/apply_fetch.conf

@@ -17,3 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/admin/orig_primary_dead.conf

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
+#
+# Email: frank.liepold@1und1.de
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/admin/resizing.conf

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
+#
+# Email: frank.liepold@1und1.de
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/hardcore/write_data_dev.conf

@@ -19,6 +19,5 @@
 
 #####################################################################
 
-
-## TODO replace source command by <no idea up to now>
-source ../mars_dir_full.conf || exit 1
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/hardcore/write_other_file.conf

@@ -20,9 +20,6 @@
 #####################################################################
 
 
-## TODO replace source command by <no idea up to now>
-source ../mars_dir_full.conf || exit 1
-
 resource_use_data_dev_writes_to_fill_mars_dir=0
 
 resource_fs_on_data_device_necessary=1

test_suite/test_cases/perf/sync/no_parallel_writer.conf

@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
-#
-# Email: frank.liepold@1und1.de
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#####################################################################
-
-
-perftest_parallel_writer=0
-

test_suite/test_cases/perf/sync/parallel_writer.conf

@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
-#
-# Email: frank.liepold@1und1.de
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#####################################################################
-
-perftest_parallel_writer=1
-resource_fs_on_data_device_necessary=1
-

test_suite/test_cases/perf/write.conf

@@ -17,14 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#####################################################################
 
-perftest_action='write'
-
-## time to run the data device writer to determine write rate
-perftest_write_time=30
-
-perftest_result_type="loops_per_min"
-
-resource_fs_on_data_device_necessary=1
-
-run_list="perftest_run lib_general_checks_after_every_test"
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/stabil/crash.conf

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
+#
+# Email: frank.liepold@1und1.de
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure

test_suite/test_cases/stabil/net_failure.conf

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Copyright 2010-2013 Frank Liepold /  1&1 Internet AG
+#
+# Email: frank.liepold@1und1.de
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#####################################################################
+
+## up to now there are no config variables defined, but the file must exist
+## due to the directory structure