diff options
Diffstat (limited to 'hardinfo2')
| -rw-r--r-- | hardinfo2/hardinfo.c | 18 | ||||
| -rw-r--r-- | hardinfo2/util.c | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c index 1cf6603a..218b4298 100644 --- a/hardinfo2/hardinfo.c +++ b/hardinfo2/hardinfo.c @@ -59,16 +59,17 @@ int main(int argc, char **argv) g_print(_("Compile-time options:\n" " Release version: %s (%s)\n" + " LibSoup version: %s\n" " BinReloc enabled: %s\n" " Data prefix: %s\n" " Library prefix: %s\n" " Compiled for: %s\n"), - RELEASE ? _("Yes") : "No (" VERSION ")", ARCH, + RELEASE==1 ? "Yes (" VERSION ")" : (RELEASE==0?"No (" VERSION ")":"Debug (" VERSION ")"), ARCH, + HARDINFO2_LIBSOUP3 ? _("3.0") : "2.4", ENABLE_BINRELOC ? _("Yes") : _("No"), PREFIX, LIBPREFIX, PLATFORM); - DEBUG(" Debugging is enabled."); - + return 0; } /* initialize the binreloc library, so we can load program data */ @@ -107,7 +108,7 @@ int main(int argc, char **argv) result = module_call_method_param("benchmark::runBenchmark", params.run_benchmark); if (!result) { - fprintf(stderr, _("Unknown benchmark ``%s''"), params.run_benchmark); + fprintf(stderr, _("Unknown benchmark ``%s''\n"), params.run_benchmark); exit_code = 1; } else { fprintf(stderr, "\n"); @@ -128,6 +129,10 @@ int main(int argc, char **argv) /* generate report */ gchar *report; + if(params.bench_user_note) {//synchronize without sending benchmarks + sync_manager_update_on_startup(0); + } + DEBUG("generating report"); report = report_create_from_module_list_format(modules, @@ -135,6 +140,11 @@ int main(int argc, char **argv) report_format); g_print("%s", report); + if(params.bench_user_note) {//synchronize + if(!params.skip_benchmarks) + sync_manager_update_on_startup(1); + } + g_free(report); } else { g_error(_("Don't know what to do. Exiting.")); diff --git a/hardinfo2/util.c b/hardinfo2/util.c index 86f2a4d2..516ddb0c 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -416,13 +416,13 @@ void parameters_init(int *argc, char ***argv, ProgramParameters * param) .short_name = 'b', .arg = G_OPTION_ARG_STRING, .arg_data = &run_benchmark, - .description = N_("run benchmark eg. -b 'FPU FFT'")}, + .description = N_("run single benchmark eg. -b 'FPU FFT' (Default all Benchmarks runs)")}, { .long_name = "user-note", .short_name = 'u', .arg = G_OPTION_ARG_STRING, .arg_data = &bench_user_note, - .description = N_("note attached to benchmark results")}, + .description = N_("user note attached to benchmark results. (updating/synchronize with server)")}, { .long_name = "result-format", .short_name = 'g', |