some fixes

Author: henricasanova

test/services/compute_services/bare_metal_compound_jobs/BareMetalComputeServiceOneActionTests.cpp

@@ -317,10 +317,10 @@ void BareMetalComputeServiceOneActionTest::do_Noop_test() {
     // Create and initialize a simulation
     auto simulation = wrench::Simulation::createSimulation();
 
-    int argc = 2;
+    int argc = 1;
     auto argv = (char **) calloc(argc, sizeof(char *));
     argv[0] = strdup("one_action_test");
-            argv[1] = strdup("--wrench-full-log");
+//            argv[1] = strdup("--wrench-full-log");
 
     ASSERT_NO_THROW(simulation->init(&argc, argv));
 

test/simulation/simulation_output/SimulationDumpJSONTest.cpp

@@ -805,7 +805,7 @@ class SimulationOutputDumpEnergyConsumptionTestWMS : public wrench::ExecutionCon
         auto em = this->createEnergyMeter(hostnames, TWO_SECOND_PERIOD);
 
         const double MEGAFLOP = 1000.0 * 1000.0;
-        wrench::S4U_Simulation::compute(6.0 * 100.0 * MEGAFLOP);// compute for 6 seconds
+        wrench::S4U_Simulation::compute(6.1 * 100.0 * MEGAFLOP);// compute for 6 seconds
 
 
         return 0;
@@ -989,8 +989,8 @@ void SimulationDumpJSONTest::do_SimulationDumpHostEnergyConsumptionJSON_test() {
         std::sort(result_json["energy_consumption"][i]["pstate_trace"].begin(), result_json["energy_consumption"][i]["pstate_trace"].end(), comparePstate);
     }
 
-    //    std::cerr << "EXPECTED: " << expected_json << "\n";
-    //    std::cerr << "RESULT: " << result_json << "\n";
+//        std::cerr << "EXPECTED: " << expected_json << "\n";
+//        std::cerr << "RESULT: " << result_json << "\n";
     EXPECT_TRUE(expected_json == result_json);
 
 

test/simulation/simulation_output/SimulationTimestampEnergyTest.cpp

@@ -444,7 +444,7 @@ class EnergyMeterMultipleMeasurementPeriodTestWMS : public wrench::ExecutionCont
         auto em = this->createEnergyMeter(measurement_periods);
 
         const double MEGAFLOP = 1000.0 * 1000.0;
-        wrench::S4U_Simulation::compute(6.0 * 100.0 * MEGAFLOP);// compute for 6 seconds
+        wrench::S4U_Simulation::compute(6.1 * 100.0 * MEGAFLOP);// compute for 6 seconds
 
         return 0;
     }