Keeping interfaces clean (avoid loading maxmin_private)

[simgrid.git] / testsuite / surf / simeng_usage.tesh

diff --git a/testsuite/surf/simeng_usage.tesh b/testsuite/surf/simeng_usage.tesh
index c42c05d..600ade4 100644 (file)
--- a/testsuite/surf/simeng_usage.tesh
+++ b/testsuite/surf/simeng_usage.tesh
@@ -2,76 +2,48 @@
 
 p Testing the surf network maxmin fairness model
 
-$ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug
+$ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug --log=surf_lagrange.thres:critical
 > [0.000000] xbt/log.c:607: [surf_test/DEBUG] Apply settings for category 'surf_test': set threshold to DEBUG (=2)
 > [0.000000] surf/simeng_usage.c:363: [surf_test/DEBUG] **************************** 
-> 
 > [0.000000] surf/simeng_usage.c:364: [surf_test/DEBUG] *****                  ***** 
-> 
 > [0.000000] surf/simeng_usage.c:365: [surf_test/DEBUG] *****      TEST 1      ***** 
-> 
 > [0.000000] surf/simeng_usage.c:366: [surf_test/DEBUG] *****                  ***** 
-> 
 > [0.000000] surf/simeng_usage.c:367: [surf_test/DEBUG] **************************** 
-> 
 > [0.000000] surf/simeng_usage.c:370: [surf_test/DEBUG] ***** Test 1 (Max-Min) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0.5
 > [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 0.5
 > [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 9.5
 > [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 0.5
 > [0.000000] surf/simeng_usage.c:376: [surf_test/DEBUG] ***** Test 1 (Lagrange - Vegas) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0.325765
 > [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 0.674235
 > [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 9.67423
 > [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 0.674235
 > [0.000000] surf/simeng_usage.c:378: [surf_test/DEBUG] ***** Test 1 (Lagrange - Reno) ***** 
-> 
-> [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0.15045
-> [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 0.84955
-> [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 9.84955
-> [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 0.84955
+> [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0
+> [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 1
+> [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 10
+> [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 1
 > [0.000000] surf/simeng_usage.c:382: [surf_test/DEBUG] **************************** 
-> 
 > [0.000000] surf/simeng_usage.c:383: [surf_test/DEBUG] *****                  ***** 
-> 
 > [0.000000] surf/simeng_usage.c:384: [surf_test/DEBUG] *****      TEST 2      ***** 
-> 
 > [0.000000] surf/simeng_usage.c:385: [surf_test/DEBUG] *****                  ***** 
-> 
 > [0.000000] surf/simeng_usage.c:386: [surf_test/DEBUG] **************************** 
-> 
 > [0.000000] surf/simeng_usage.c:389: [surf_test/DEBUG] ***** Test 2 (Max-Min) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:163: [surf_test/DEBUG] T1 = 200
 > [0.000000] surf/simeng_usage.c:164: [surf_test/DEBUG] T2 = 100
-> [0.000000] surf/simeng_usage.c:166: [surf_test/DEBUG] 
-> 
 > [0.000000] surf/simeng_usage.c:395: [surf_test/DEBUG] ***** Test 2 (Lagrange - Vegas) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:163: [surf_test/DEBUG] T1 = 200
 > [0.000000] surf/simeng_usage.c:164: [surf_test/DEBUG] T2 = 100
-> [0.000000] surf/simeng_usage.c:166: [surf_test/DEBUG] 
-> 
 > [0.000000] surf/simeng_usage.c:397: [surf_test/DEBUG] ***** Test 2 (Lagrange - Reno) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:163: [surf_test/DEBUG] T1 = 200
 > [0.000000] surf/simeng_usage.c:164: [surf_test/DEBUG] T2 = 100
-> [0.000000] surf/simeng_usage.c:166: [surf_test/DEBUG] 
-> 
 > [0.000000] surf/simeng_usage.c:402: [surf_test/DEBUG] **************************** 
-> 
 > [0.000000] surf/simeng_usage.c:403: [surf_test/DEBUG] *****                  ***** 
-> 
 > [0.000000] surf/simeng_usage.c:404: [surf_test/DEBUG] *****      TEST 3      ***** 
-> 
 > [0.000000] surf/simeng_usage.c:405: [surf_test/DEBUG] *****                  ***** 
-> 
 > [0.000000] surf/simeng_usage.c:406: [surf_test/DEBUG] **************************** 
-> 
 > [0.000000] surf/simeng_usage.c:409: [surf_test/DEBUG] ***** Test 3 (Max-Min) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.33333
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 2
@@ -89,7 +61,6 @@ $ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1
 > [0.000000] surf/simeng_usage.c:415: [surf_test/DEBUG] ***** Test 3 (Lagrange - Vegas) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.61019
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.33333
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 2.65418
@@ -107,7 +78,6 @@ $ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1
 > [0.000000] surf/simeng_usage.c:417: [surf_test/DEBUG] ***** Test 3 (Lagrange - Reno) ***** 
-> 
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.27888
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.33333
 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 2.24092