Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
henricasanova committed Nov 21, 2023
1 parent af76c4e commit 73a565e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
6 changes: 3 additions & 3 deletions test/simulation/simulation_output/SimulationDumpJSONTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 73a565e

Please sign in to comment.