Skip to content
This repository was archived by the owner on Dec 22, 2022. It is now read-only.

Commit 1fbdf71

Browse files
author
Cormac Garvey
committed
Minor formatting changes in resulting testing output files.
1 parent 9e7cbb8 commit 1fbdf71

13 files changed

+11
-17
lines changed

‎apptest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ std::string AppTest::exeAppTest(std::ofstream &flog, std::ofstream &fresult, con
184184
std::string script_cmd;
185185
std::string modules_str;
186186

187-
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << check_file_name << " job." << std::endl;
187+
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << check_file_name << std::endl;
188188
// std::cout << job_script.getExeName() << " " << job_script.getExeArgs() << std::endl;
189189
if (modules_load(flog, job_script.getModules(), module_load_result)) {
190190
modules_str = modules_string(job_script.getModules());

‎cthtest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ std::string CthTest::exeAppTest(std::ofstream &flog, std::ofstream &fresult, con
277277
std::string script_cmd;
278278
std::string modules_str;
279279

280-
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << " job." << std::endl;
280+
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << std::endl;
281281
// std::cout << job_script.getExeName() << " " << job_script.getExeArgs() << std::endl;
282282
if (modules_load(flog, job_script.getModules(), module_load_result)) {
283283
modules_str = modules_string(job_script.getModules());

‎gaussiantest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void GaussianTest::runTest() {
8787
for (auto gaussian_input: gaussian_inputs_) {
8888
createFileFromStr(getInputFileNames()[c_i], gaussian_input);
8989
// script_cmd_result = subJobScript(flog_, getJobScripts()[c_i]);
90-
script_cmd_result = exeAppTest(flog_, fresult_, getJobScripts()[c_i], getInputFileNames()[c_i] + ".out");
90+
script_cmd_result = exeAppTest(flog_, fresult_, getJobScripts()[c_i], getInputFileNames()[c_i]);
9191
checkSubmitResult(script_cmd_result, flog_, fresult_);
9292
++c_i;
9393
}

‎heliostest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ void HeliosTest::runTest() {
967967
createFileFromStr("aurora-31.inp", new_helios_aurora_31_input);
968968
createFileFromStr("zenith-31.inp", helios_zenith_31_inputs_[c_i]);
969969
createHeliosJob(helios_job);
970-
fresult_ << module_name_version(getJobScripts()[c_i].getModules()[getJobScripts()[c_i].getModules().size()-1]) << "\t" << helios_dir << "\t" << getJobScripts()[c_i].getJobName() << "\t" << "job." << std::endl;
970+
fresult_ << module_name_version(getJobScripts()[c_i].getModules()[getJobScripts()[c_i].getModules().size()-1]) << "\t" << helios_dir << "\t" << getJobScripts()[c_i].getJobName() << "\t" << std::endl;
971971
script_cmd_result = subJobScript(flog_, helios_job);
972972
checkSubmitResult(script_cmd_result, flog_, fresult_);
973973
changeDir("..");

‎lammpstest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ std::string LammpsTest::exeAppTest(std::ofstream &flog, std::ofstream &fresult,
9595
std::string modules_str;
9696

9797
// job_script.generate();
98-
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << " job." << std::endl;
98+
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << std::endl;
9999
// std::cout << job_script.getExeName() << " " << job_script.getExeArgs() << std::endl;
100100
if (modules_load(flog, job_script.getModules(), module_load_result)) {
101101
modules_str = modules_string(job_script.getModules());

‎matlabtest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void MatlabTest::runTest() {
7070
int c_i = 0;
7171
for (auto matlab_input: matlab_inputs_) {
7272
createFileFromStr(getInputFileNames()[c_i], matlab_input);
73-
fresult_ << module_name_version(getJobScripts()[c_i].getModules()[getJobScripts()[c_i].getModules().size()-1]) << "\t" << getJobScripts()[c_i].getJobName() << "\t" << "job." << std::endl;
73+
fresult_ << module_name_version(getJobScripts()[c_i].getModules()[getJobScripts()[c_i].getModules().size()-1]) << "\t" << getJobScripts()[c_i].getJobName() << std::endl;
7474
script_cmd_result = subJobScript(flog_, getJobScripts()[c_i]);
7575
checkSubmitResult(script_cmd_result, flog_, fresult_);
7676
++c_i;

‎mc21test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39476,7 +39476,7 @@ std::string Mc21Test::exeAppTest(std::ofstream &flog, std::ofstream &fresult, co
3947639476
std::string modules_str;
3947739477

3947839478
// job_script.generate();
39479-
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << " job." << std::endl;
39479+
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << std::endl;
3948039480
// std::cout << job_script.getExeName() << " " << job_script.getExeArgs() << std::endl;
3948139481
if (modules_load(flog, job_script.getModules(), module_load_result)) {
3948239482
modules_str = modules_string(job_script.getModules());

‎nwchemtest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ std::string NwchemTest::exeAppTest(std::ofstream &flog, std::ofstream &fresult,
119119
std::string modules_str;
120120

121121
// job_script.generate();
122-
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << " job." << std::endl;
122+
fresult << module_name_version(job_script.getModules()[job_script.getModules().size()-1]) << "\t" << dir_path << "\t" << job_script.getJobName() << std::endl;
123123
// std::cout << job_script.getExeName() << " " << job_script.getExeArgs() << std::endl;
124124
if (modules_load(flog, job_script.getModules(), module_load_result)) {
125125
modules_str = modules_string(job_script.getModules());

‎python2test.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ void Python2Test::runTest() {
112112
std::string cmd_result;
113113
std::string script_cmd_result;
114114
std::string modules_load_result;
115-
std::time_t date_result = std::time(NULL);
116115
// std::cout << "Execute runTest member function from Python2Test object " << __FILE__ << "\t" <<__LINE__ << std::endl;
117116
if (!flog_.is_open()) {
118117
std::cerr << "Error: (" << __FILE__ << "," << __LINE__ << ") Opening file " << log_file_name_ << std::endl;
@@ -122,8 +121,6 @@ void Python2Test::runTest() {
122121
std::cerr << "Error: (" << __FILE__ << "," << __LINE__ << ") Opening file " << result_file_name_ << std::endl;
123122
exit(EXIT_FAILURE);
124123
}
125-
fresult_ << std::ctime(&date_result) << std::endl;
126-
fresult_ << getTestName() << " tests run on " << getHostName() << std::endl;
127124
std::cout << "Testing: " << module_name_version(getJobScripts()[0].getModules()[getJobScripts()[0].getModules().size()-1]) << std::endl;
128125
modules_load(flog_, getJobScripts()[0].getModules(), modules_load_result);
129126
int c_i = 0;

‎python3test.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ void Python3Test::runTest() {
5353
std::string cmd_result;
5454
std::string script_cmd_result;
5555
std::string modules_load_result;
56-
std::time_t date_result = std::time(NULL);
5756
// std::cout << "Execute runTest member function from Python3Test object " << __FILE__ << "\t" <<__LINE__ << std::endl;
5857
if (!flog_.is_open()) {
5958
std::cerr << "Error: (" << __FILE__ << "," << __LINE__ << ") Opening file " << log_file_name_ << std::endl;
@@ -63,8 +62,6 @@ void Python3Test::runTest() {
6362
std::cerr << "Error: (" << __FILE__ << "," << __LINE__ << ") Opening file " << result_file_name_ << std::endl;
6463
exit(EXIT_FAILURE);
6564
}
66-
fresult_ << std::ctime(&date_result) << std::endl;
67-
fresult_ << getTestName() << " tests run on " << getHostName() << std::endl;
6865
std::cout << "Testing: " << module_name_version(getJobScripts()[0].getModules()[getJobScripts()[0].getModules().size()-1]) << std::endl;
6966
modules_load(flog_, getJobScripts()[0].getModules(), modules_load_result);
7067
int c_i = 0;

0 commit comments

Comments
 (0)