on xenial help sign in
Guard against greedy regex
commit592550cae7bdcfb6ea3aec7e0141197915ff801a authorMichael Terry <michael.terry@canonical.com> dateTue 7 Jun 2016, 09:25 (10 years ago) parente9ac903
1 file changed+1−1
cmake/modules/QmlTest.cmake+1−1
cmake/modules/QmlTest.cmake+1−1
@@ -330,7 +330,7 @@ function(install_test_script TARGET_NAME)
330330 # tests like to write xml output to our builddir; we don't need that, but we do want them in ARTIFACTS_DIR
331331 string(REGEX MATCH \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" xmlargs \"\${replacestr}\")
332332 string(REGEX REPLACE \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" \" \\\$XML_ARGS \" replacestr \"\${replacestr}\")
333− string(REGEX REPLACE \"'.*/tests/\" \"'\\\$ARTIFACTS_DIR/tests/\" xmlargs \"\${xmlargs}\")
333+ string(REGEX REPLACE \"'[^']*/tests/\" \"'\\\$ARTIFACTS_DIR/tests/\" xmlargs \"\${xmlargs}\")
334334 string(REGEX REPLACE \".*'([^']*),xunitxml'.*\" \"\\\\1\" xmlfile \"\${xmlargs}\")
335335 string(REGEX REPLACE \"(.*)/[^/]*\" \"\\\\1\" xmldir \"\${xmlfile}\")
336336 string(REGEX REPLACE \"'\" \"\" xmlargs \"\${xmlargs}\") # strip single quotes