From d57c2f3f969035702062b89b5f5006a54dd532b9 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 22 Mar 2010 17:32:16 -0700 Subject: [PATCH] Updated dav_test now looks for DATA= as simple filename. --- .gitignore | 1 + testing/dav_test | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bbaa9120..5caa0ef1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ inc/test-RRULE-v2.php perms-perf.base random_crap testing/tests/google +testing/tests/local testing/timing.stats* diff --git a/testing/dav_test b/testing/dav_test index bc0c9057..150c743e 100755 --- a/testing/dav_test +++ b/testing/dav_test @@ -117,8 +117,14 @@ while( ) { $line =~ /^\s*DATA\s*=\s*(\S.*)$/ && do { my $basename = $1; - if ( defined($suite) && -e "tests/$suite/$basename.data" ) { - $datafile="tests/$suite/$basename.data"; + if ( defined($suite) ) { + if ( -e "tests/$suite/$basename.data" ) { + $datafile="tests/$suite/$basename.data"; + } + elsif ( -e "tests/$suite/$basename" ) { + $datafile="tests/$suite/$basename"; + } + } elsif ( -e "$basename.data" ) { $datafile="$basename.data";