From ac8718463392d74ca8918e7ec1ce4ff33c649663 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 30 Mar 2017 16:06:53 +0200
Subject: [PATCH] do not initialize surf for nothing

---
 teshsuite/surf/lmm_usage/lmm_usage.cpp               | 3 ---
 teshsuite/surf/maxmin_bench/maxmin_bench.cpp         | 6 +-----
 teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh | 3 ---
 teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh  | 3 ---
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp
index c671bda967..a1ebb43be9 100644
--- a/teshsuite/surf/lmm_usage/lmm_usage.cpp
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -300,8 +300,6 @@ static void test3(method_t method)
 
 int main(int argc, char **argv)
 {
-  surf_init(&argc, argv);
-
   XBT_INFO("***** Test 1 (Max-Min)");
   test1(MAXMIN);
   XBT_INFO("***** Test 1 (Lagrange - Vegas)");
@@ -323,6 +321,5 @@ int main(int argc, char **argv)
   XBT_INFO("***** Test 3 (Lagrange - Reno)");
   test3(LAGRANGE_RENO);
 
-  surf_exit();
   return 0;
 }
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp
index 36e715bd05..bc5bbe5f7d 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp
@@ -6,7 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/include/surf/surf.h"
 #include "surf/maxmin.h"
 #include "xbt/module.h"
 #include "xbt/xbt_os_time.h"
@@ -176,8 +175,6 @@ int main(int argc, char **argv)
   //Otherwise, just set it to a constant value (and set rate_no_limit to 1.0):
   //nb_elem=200
 
-  surf_init(&argc, argv);
-
   for(int i=0;i<testcount;i++){
     seedx=i+1;
     fprintf(stderr, "Starting %i: (%i)\n",i,myrand()%1000);
@@ -195,7 +192,6 @@ int main(int argc, char **argv)
          testcount,nb_cnst, nb_var, nb_elem, (1<<pw_base_limit), (1<<pw_base_limit)+(1<<pw_max_limit), max_share);
   if(mode==3)
     fprintf(stderr, "Execution time: %g +- %g  microseconds \n",mean_date, stdev_date);
-   
-  surf_exit();
+
   return 0;
 }
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
index a7e447259d..7e385141cb 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
@@ -4,8 +4,6 @@
 ! expect return 0
 ! output sort
 $ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench medium 5 test
-> [0.000000]: [surf_kernel/DEBUG] Add SURF levels
-> [0.000000]: [surf_kernel/DEBUG] Create all Libs
 > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1
 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 100
 > [0.000000]: [surf_maxmin/DEBUG] Constraint '98' usage: 13.060939 remaining: 3.166833 concurrency: 7<=8<=10
@@ -2886,4 +2884,3 @@ $ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench medium 5 test
 > Starting 4: (35)
 > Starting to solve(210)
 > 5x One shot execution time for a total of 100 constraints, 100 variables with 24 active constraint each, concurrency in [8,72] and max concurrency share 2
-
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
index b3edd1c94c..2ecb950712 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
@@ -4,8 +4,6 @@
 ! expect return 0
 ! output sort
 $ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench small  10 test
-> [0.000000]: [surf_kernel/DEBUG] Add SURF levels
-> [0.000000]: [surf_kernel/DEBUG] Create all Libs
 > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1
 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 10
 > [0.000000]: [surf_maxmin/DEBUG] Constraint '9' usage: 4.703796 remaining: 7.082917 concurrency: 2<=2<=-1
@@ -755,4 +753,3 @@ $ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench small  10 test
 > Starting 9: (70)
 > Starting to solve(117)
 > 10x One shot execution time for a total of 10 constraints, 10 variables with 4 active constraint each, concurrency in [2,6] and max concurrency share 2
-
-- 
2.20.1