X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCore%2FTest%2Fbatchtest.conf;h=f8cdcf304f5184cbe069ee37358a467caa41b022;hb=81d83ed5bb4d235c5688dcec0e9458015e760e26;hp=2d30ca9bd7ef7522f144a34c8c7ca6bcbc77e214;hpb=c946a2afa2f34838ecd2475df349dc45d06cdde8;p=tools%2Flibbatch.git

diff --git a/src/Core/Test/batchtest.conf b/src/Core/Test/batchtest.conf
index 2d30ca9..f8cdcf3 100644
--- a/src/Core/Test/batchtest.conf
+++ b/src/Core/Test/batchtest.conf
@@ -5,46 +5,27 @@
 # Note that BATCH_TEST_CONFIG_FILE is the default name for this environment variable. It can be
 # changed at compilation time by setting CMake option TEST_CONFIG_FILE_ENV_VAR.
 
+TEST_LOCAL_SH_HOST = "localhost"              # Not used
+TEST_LOCAL_SH_USER = "me"                     # Not used
 TEST_LOCAL_SH_WORK_DIR = "/tmp"               # Work directory for local SH Batch test
 TEST_LOCAL_SH_TIMEOUT = 2                     # Execution timeout (in seconds) for local SH Batch test
-TEST_LOCAL_SH_FINALIZATION_TIME = 2           # Finalization time (in seconds) for local SH Batch test
 
-TEST_LOCAL_RSH_EXECUTION_HOST = "localhost"   # Execution host for RSH Batch test
-TEST_LOCAL_RSH_USER = "username"              # User name on the execution host for RSH Batch test
-TEST_LOCAL_RSH_WORK_DIR = "/tmp"              # Work directory for RSH Batch test
-TEST_LOCAL_RSH_TIMEOUT = 10                   # Execution timeout (in seconds) for local RSH Batch test
-TEST_LOCAL_RSH_FINALIZATION_TIME = 5          # Finalization time (in seconds) for local RSH Batch test
-
-TEST_LOCAL_SSH_EXECUTION_HOST = "localhost"   # Execution host for SSH Batch test
-TEST_LOCAL_SSH_USER = "username"              # User name on the execution host for SSH Batch test
-TEST_LOCAL_SSH_WORK_DIR = "/tmp"              # Work directory for SSH Batch test
-TEST_LOCAL_SSH_TIMEOUT = 10                   # Execution timeout (in seconds) for local SSH Batch test
-TEST_LOCAL_SSH_FINALIZATION_TIME = 5          # Finalization time (in seconds) for local SSH Batch test
-
-TEST_PBS_HOST = "localhost"                   # PBS server host
-TEST_PBS_USER = "username"                    # Login for the PBS server
-TEST_PBS_QUEUE = "queuename"                  # Queue to submit test job on PBS server
-TEST_PBS_TIMEOUT = 120                        # Execution timeout (in seconds) for PBS Batch test
-
-TEST_EPBS_HOST = "localhost"                  # PBS server host
-TEST_EPBS_USER = "username"                   # Login for the PBS server
-TEST_EPBS_HOMEDIR = "/home/username"          # Home directory on PBS server
-TEST_EPBS_QUEUE = "queuename"                 # Queue to submit test job on PBS server
-TEST_EPBS_TIMEOUT = 120                       # Execution timeout (in seconds) for PBS Batch test
-
-TEST_ELL_HOST = "localhost"                   # LoadLeveler server host
-TEST_ELL_USER = "username"                    # Login for the LoadLeveler server
-TEST_ELL_HOMEDIR = "/home/username"           # Home directory on LoadLeveler server
-TEST_ELL_QUEUE = "classname"                  # Class for the test job test job on LoadLeveler server
-TEST_ELL_JOBTYPE = "serial"                   # Job type for LoadLeveler
-TEST_ELL_TIMEOUT = 120                        # Execution timeout (in seconds) for LoadLeveler Batch test
-
-TEST_ESLURM_HOST = "localhost"                # Slurm server host
-TEST_ESLURM_USER = "username"                 # Login for the Slurm server
-TEST_ESLURM_HOMEDIR = "/home/username"        # Home directory on Slurm server
-TEST_ESLURM_TIMEOUT = 120                     # Execution timeout (in seconds) for Slurm Batch test
-
-TEST_EVISHNU_HOST = "localhost"               # Machine ID of the target cluster
-TEST_EVISHNU_USER = "username"                # Vishnu login (unused)
-TEST_EVISHNU_HOMEDIR = "/home/username"       # Home directory on the target cluster
-TEST_EVISHNU_TIMEOUT = 120                    # Execution timeout (in seconds) for Vishnu Batch test
+TEST_LOCAL_HOST = "localhost"                 # Execution host for LOCAL Batch test
+TEST_LOCAL_USER = "username"                  # User name on the execution host for LOCAL Batch test
+TEST_LOCAL_WORKDIR = "/tmp"                   # Work directory for LOCAL Batch test
+TEST_LOCAL_TIMEOUT = 10                       # Execution timeout (in seconds) for LOCAL Batch test
+
+TEST_LSF_HOST = "localhost"                   # LSF server host
+TEST_LSF_USER = "username"                    # Login for the LSF server
+TEST_LSF_WORKDIR = "/home/username/wrk"       # Work directory on LSF server
+TEST_LSF_TIMEOUT = 120                        # Execution timeout (in seconds) for LSF Batch test
+
+TEST_SLURM_HOST = "localhost"                 # Slurm server host
+TEST_SLURM_USER = "username"                  # Login for the Slurm server
+TEST_SLURM_WORKDIR = "/home/username/wrk"     # Work directory on Slurm server
+TEST_SLURM_TIMEOUT = 120                      # Execution timeout (in seconds) for Slurm Batch test
+
+TEST_VISHNU_HOST = "localhost"                # Machine ID of the target cluster
+TEST_VISHNU_USER = "username"                 # Vishnu login (unused)
+TEST_VISHNU_WORKDIR = "/home/username/wrk"    # Work directory on the target cluster
+TEST_VISHNU_TIMEOUT = 120                     # Execution timeout (in seconds) for Vishnu Batch test