Commit 551eb49f authored by Charles Ferguson's avatar Charles Ferguson
Browse files

Fix for perl test runs.

Perl test runs would fail due to problems with the deletion of the
xml files - of which there were none. Similarly, we didn't support
version numbers of modules that were not integers, without quotes.
parent 95d2f280
......@@ -337,10 +337,10 @@ function merge_test_results() {
"${scripts}/junit-xml" --fix-nosetests \
--output "${artifact_dir}/test-results.xml" \
"${test_files[@]}"
fi
# And clear up the files that we now no-longer need.
rm "${test_files[@]}"
fi
}
......
......@@ -134,7 +134,7 @@ function check_module() {
if (open(my \$fh, '<', \$filename)) {
my \$nlines = 0;
while (<\$fh>) {
if (/\\\$VERSION *= *(?:[\"']([0-9\\.]+)[\"']|([0-9]+))/) {
if (/\\\$VERSION *= *(?:[\"']([0-9\\.]+)[\"']|([0-9\.]+))/) {
\$modversion = \$1 // \$2;
last;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment