From 3cf3083cbdfe5751eac07d19bcc265360b5865f9 Mon Sep 17 00:00:00 2001 From: Paul McCarthy <pauldmccarthy@gmail.com> Date: Fri, 28 Jul 2023 15:13:50 +0100 Subject: [PATCH] TEST: Just creating an OptionParser is not enough, as the OptionParser class is entirely defined in options.h, and the linker may optimise out libfsl-utils. The usage function is in options.cc though --- unit_tests/utils/feedsRun.fslStartup | 2 +- unit_tests/utils/test_fslStartup.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/unit_tests/utils/feedsRun.fslStartup b/unit_tests/utils/feedsRun.fslStartup index 2586cb9..9c014bc 100755 --- a/unit_tests/utils/feedsRun.fslStartup +++ b/unit_tests/utils/feedsRun.fslStartup @@ -27,7 +27,7 @@ def run(cmd, ompthreads=None, blasthreads=None, fslskipglobal=None): print(f' exit code: {result.returncode}') print(f' stdout: {result.stdout.strip()}') - return result.stdout.strip() + return result.stdout.strip().split('\n')[-1] def main(): diff --git a/unit_tests/utils/test_fslStartup.cc b/unit_tests/utils/test_fslStartup.cc index 7c7f913..740091d 100644 --- a/unit_tests/utils/test_fslStartup.cc +++ b/unit_tests/utils/test_fslStartup.cc @@ -19,6 +19,7 @@ int main(int argc, char *argv[]) { // Use something from libfsl-utils.so // to ensure that it gets linked. Utilities::OptionParser opts("test", "test"); + opts.usage(); int omp_threads; int blas_threads; -- GitLab