Merge class BatchManager_eClient into class BatchManager

[tools/libbatch.git] / src / LoadLeveler / Test / Test_eLL.cxx

diff --git a/src/LoadLeveler/Test/Test_eLL.cxx b/src/LoadLeveler/Test/Test_eLL.cxx
index a3e70d616eecb69fd3ac89e5fcd894cbf9f18a62..8f897cc2fe57c28ff4cbfc1fb6fa6226596ed31a 100644 (file)
--- a/src/LoadLeveler/Test/Test_eLL.cxx
+++ b/src/LoadLeveler/Test/Test_eLL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,10 +35,8 @@
 #include <Batch_Job.hxx>
 #include <Batch_BatchManagerCatalog.hxx>
 #include <Batch_FactBatchManager.hxx>
-#include <Batch_FactBatchManager_eClient.hxx>
 #include <Batch_FactBatchManager_eLL.hxx>
 #include <Batch_BatchManager.hxx>
-#include <Batch_BatchManager_eClient.hxx>
 
 #include <SimpleParser.hxx>
 
@@ -98,13 +96,13 @@ int main(int argc, char** argv)
     p[INFILE]        = Couple("seta.sh", "tmp/Batch/seta.sh");
     p[INFILE]       += Couple("setb.sh", "tmp/Batch/setb.sh");
     p[OUTFILE]       = Couple("result.txt", "tmp/Batch/result.txt");
-    p[TMPDIR]        = "tmp/Batch/";
     p[NBPROC]        = 1;
     p[MAXWALLTIME]   = 1;
     p[MAXRAMSIZE]    = 50;
     p[HOMEDIR]       = homedir;
     p[QUEUE]         = queue;
-    p[LL_JOBTYPE]       = jobType;
+    p[LL_JOBTYPE]    = jobType;
+    p[EXCLUSIVE]     = false;
     job.setParametre(p);
     // ... and its environment
     Environnement e;
@@ -116,8 +114,8 @@ int main(int argc, char** argv)
     BatchManagerCatalog& c = BatchManagerCatalog::getInstance();
 
     // Create a BatchManager of type ePBS on localhost
-    FactBatchManager_eClient * fbm = (FactBatchManager_eClient *)(c("eLL"));
-    BatchManager_eClient * bm = (*fbm)(host.c_str(), user.c_str(), protocol);
+    FactBatchManager * fbm = c("LL");
+    BatchManager * bm = (*fbm)(host.c_str(), user.c_str(), protocol);
 
     // Submit the job to the BatchManager
     JobId jobid = bm->submitJob(job);