From: Kefu Chai Date: Mon, 1 Jul 2019 12:39:03 +0000 (+0800) Subject: test/cli/ceph-conf: fix test X-Git-Tag: v15.1.0~2327^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bbf1b909320287543d55be8632bd38d5a5ab9e75;p=ceph-ci.git test/cli/ceph-conf: fix test turns out the libstdc++ on fc30 does not include error_code.message() in filesystem_error.what(). let's make it optional Signed-off-by: Kefu Chai --- diff --git a/src/test/cli/ceph-conf/env-vs-args.t b/src/test/cli/ceph-conf/env-vs-args.t index db8965dedad..8e76f036569 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: cannot get 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: cannot get file size: (No such file or directory )?\[from-env\] (re) [1] # command-line arguments should override environment