diff --git a/src/test/match b/src/test/match index 787f5b84d0e44c1bec837fc078b7aa093f972d08..42debef6a473c3f453fb701faeef890bef7fef9d 100755 --- a/src/test/match +++ b/src/test/match @@ -1,6 +1,6 @@ #!/usr/bin/env perl # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2020, Intel Corporation # # match -- compare an output file with expected results @@ -30,6 +30,7 @@ # $(OPX) ends a contiguous list of $(OPT)...$(OPX) lines, at least # one of which must match # ${string1|string2} string1 OR string2 +# ${string1|string2|string3} string1 OR string2 OR string3 # # Additionally, if any "X.ignore" file exists, strings or phrases found per # line in the file will be ignored if found as a substring in the @@ -210,6 +211,7 @@ sub match { s/\\\$\\\(W\\\)/\\p{Blank}*/g; s/\\\$\\\(nW\\\)/\\p{Graph}*/g; s/\\\$\\\{([^|]*)\\\|([^|]*)\\\}/($1|$2)/g; + s/\\\$\\\{([^|]*)\\\|([^|]*)\\\|([^|]*)\\\}/($1|$2|$3)/g; s/\\\$\\\(DD\\\)/\\d+\\+\\d+ records in\n\\d+\\+\\d+ records out\n\\d+ bytes \\\(\\d+ .B\\\) copied, [.0-9e-]+[^,]*, [.0-9]+ .B.s/g; if (s/\\\$\\\(OPT\\\)//) { $opt = 1; diff --git a/src/test/pmem_deep_persist/grep2.log.match b/src/test/pmem_deep_persist/grep2.log.match index 0d66ea1aee9527bfa39185ead1f9cdbd96bba88c..80ddebc4d22b7f6d92d775a795491e4012a48e7d 100644 --- a/src/test/pmem_deep_persist/grep2.log.match +++ b/src/test/pmem_deep_persist/grep2.log.match @@ -1,2 +1,2 @@ 0 -1 +${1|2} diff --git a/src/test/pmem_deep_persist/grep8.log.match b/src/test/pmem_deep_persist/grep8.log.match index e2e03891c99322763c9377c10bb22134c30c1e64..67db7fb97d16e8753194fd6d4b6dac1aa4041f1e 100644 --- a/src/test/pmem_deep_persist/grep8.log.match +++ b/src/test/pmem_deep_persist/grep8.log.match @@ -1,2 +1,2 @@ ${1|12} -${1|12} +${1|12|24} diff --git a/src/test/pmem_deep_persist/grep9.log.match b/src/test/pmem_deep_persist/grep9.log.match index bb2733a4a887abda75f07692815d894aff157d09..d7b961f18c11b9714a6da66fc38b081beed1de4a 100644 --- a/src/test/pmem_deep_persist/grep9.log.match +++ b/src/test/pmem_deep_persist/grep9.log.match @@ -1,2 +1,2 @@ ${2|13} -${2|13} +${2|13|26}