diff --git a/sched/Makefile.am b/sched/Makefile.am index c023eb226f..2fe3393981 100644 --- a/sched/Makefile.am +++ b/sched/Makefile.am @@ -117,6 +117,7 @@ schedshare_PROGRAMS = \ sample_substr_validator \ sample_trivial_validator \ sample_work_generator \ + script_validator \ single_job_assimilator \ size_regulator \ transitioner \ @@ -249,6 +250,10 @@ single_job_assimilator_LDADD = $(SERVERLIBS) sample_work_generator_SOURCES = sample_work_generator.cpp sample_work_generator_LDADD = $(SERVERLIBS) +script_validator_SOURCES = $(VALIDATOR_SOURCES) \ + script_validator.cpp +script_validator_LDADD = $(SERVERLIBS) + db_dump_SOURCES = db_dump.cpp db_dump_LDADD = $(SERVERLIBS) diff --git a/sched/script_validator.cpp b/sched/script_validator.cpp index 43b80dece8..448583f4aa 100644 --- a/sched/script_validator.cpp +++ b/sched/script_validator.cpp @@ -15,7 +15,9 @@ // You should have received a copy of the GNU Lesser General Public License // along with BOINC. If not, see . -// A validator that runs scripts to check and compare results +// A validator that runs scripts to check and compare results, +// so that you can do your validation on Python, Perl, bash, etc. +// // cmdline args: // --init_script scriptname // --compare_script scriptname diff --git a/sched/validate_util.cpp b/sched/validate_util.cpp index 1794f05353..3ff52ccf45 100644 --- a/sched/validate_util.cpp +++ b/sched/validate_util.cpp @@ -61,7 +61,7 @@ int OUTPUT_FILE_INFO::parse(XML_PARSER& xp) { return ERR_XML_PARSE; } -int get_output_file_info(RESULT& result, OUTPUT_FILE_INFO& fi) { +int get_output_file_info(RESULT const& result, OUTPUT_FILE_INFO& fi) { char path[MAXPATHLEN]; string name; MIOFILE mf; @@ -87,7 +87,7 @@ int get_output_file_info(RESULT& result, OUTPUT_FILE_INFO& fi) { return ERR_XML_PARSE; } -int get_output_file_infos(RESULT& result, vector& fis) { +int get_output_file_infos(RESULT const& result, vector& fis) { char path[MAXPATHLEN]; MIOFILE mf; string name; @@ -115,7 +115,7 @@ int get_output_file_infos(RESULT& result, vector& fis) { return 0; } -int get_output_file_path(RESULT& result, string& path) { +int get_output_file_path(RESULT const& result, string& path) { OUTPUT_FILE_INFO fi; int retval = get_output_file_info(result, fi); if (retval) return retval; @@ -123,7 +123,7 @@ int get_output_file_path(RESULT& result, string& path) { return 0; } -int get_output_file_paths(RESULT& result, vector& paths) { +int get_output_file_paths(RESULT const& result, vector& paths) { vector fis; int retval = get_output_file_infos(result, fis); if (retval) return retval; diff --git a/sched/validate_util.h b/sched/validate_util.h index ab76df26d5..157ad066cd 100644 --- a/sched/validate_util.h +++ b/sched/validate_util.h @@ -37,10 +37,10 @@ struct OUTPUT_FILE_INFO { int parse(XML_PARSER&); }; -extern int get_output_file_info(RESULT& result, OUTPUT_FILE_INFO&); -extern int get_output_file_infos(RESULT& result, std::vector&); -extern int get_output_file_path(RESULT& result, std::string&); -extern int get_output_file_paths(RESULT& result, std::vector&); +extern int get_output_file_info(RESULT const& result, OUTPUT_FILE_INFO&); +extern int get_output_file_infos(RESULT const& result, std::vector&); +extern int get_output_file_path(RESULT const& result, std::string&); +extern int get_output_file_paths(RESULT const& result, std::vector&); extern int get_logical_name( RESULT& result, std::string& path, std::string& name );