From 1a4a8b3bc684a13d8447edbeed86b6503ec3e1f6 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Tue, 30 Jul 2019 21:43:56 +0200 Subject: [PATCH] test/cli: Make the ceph-conf test more liberal The tests look for the exact error text. But they are OS dependant, and thus on FreeBSD the output is slightly different: 2019-07-30T19:04:16.581+0000 80bc48000 -1 parse_file: filesystem error: in file_size: No such file or directory [from-env] This stems from the fact that different OSes use different standard libraries: libc++ <> libstd++ Signed-off-by: Willem Jan Withagen --- src/test/cli/ceph-conf/env-vs-args.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/cli/ceph-conf/env-vs-args.t b/src/test/cli/ceph-conf/env-vs-args.t index 8e76f036569..3e7f6edb6ff 100644 --- a/src/test/cli/ceph-conf/env-vs-args.t +++ b/src/test/cli/ceph-conf/env-vs-args.t @@ -2,9 +2,9 @@ $ env CEPH_CONF=from-env ceph-conf -s foo bar did not load config file, using default settings. .* \-1 Errors while parsing config file! (re) - .* \-1 parse_file: filesystem error: cannot get file size: (No such file or directory )?\[from-env\] (re) + .* \-1 parse_file: filesystem error: .* file.size: (No such file or directory )?\[from-env\] (re) .* \-1 Errors while parsing config file! (re) - .* \-1 parse_file: filesystem error: cannot get file size: (No such file or directory )?\[from-env\] (re) + .* \-1 parse_file: filesystem error: .* file.size: (No such file or directory )?\[from-env\] (re) [1] # command-line arguments should override environment -- 2.39.5