diff options
| author | Yann Ylavic <ylavic@apache.org> | 2021-03-31 19:57:06 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2021-03-31 19:57:06 +0000 |
| commit | 79a3c02b269afbfca9a4bc9f2e23d4a382cb6cb6 (patch) | |
| tree | 3d49b61c46aae553df435ac53becc42d76a1f014 /test | |
| parent | e0197912a5438b3836ce2e76371f01e289d82931 (diff) | |
| download | apr-79a3c02b269afbfca9a4bc9f2e23d4a382cb6cb6.tar.gz | |
Merge r1887490, r1888251 from trunk:
testfnmatch: fix number of expected test/data/*.txt files.
Maybe there used to be 10 test/data/*.txt files, there are 3 only now.
testfile: don't generate .txt files since it distorts testfnmatch results.
Change to .dat files instead (also in svn:ignore).
Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1888252 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
| -rw-r--r-- | test/testfile.c | 6 | ||||
| -rw-r--r-- | test/testfnmatch.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/testfile.c b/test/testfile.c index 8ed6b5128..25bfef5bf 100644 --- a/test/testfile.c +++ b/test/testfile.c @@ -606,7 +606,7 @@ static void file_contents_equal(abts_case *tc, static void test_puts(abts_case *tc, void *data) { apr_file_t *f; - const char *fname = "data/testputs.txt"; + const char *fname = "data/testputs.dat"; APR_ASSERT_SUCCESS(tc, "open file for writing", apr_file_open(&f, fname, @@ -629,7 +629,7 @@ static void test_writev(abts_case *tc, void *data) apr_file_t *f; apr_size_t nbytes; struct iovec vec[5]; - const char *fname = "data/testwritev.txt"; + const char *fname = "data/testwritev.dat"; APR_ASSERT_SUCCESS(tc, "open file for writing", apr_file_open(&f, fname, @@ -671,7 +671,7 @@ static void test_writev_full(abts_case *tc, void *data) apr_file_t *f; apr_size_t nbytes; struct iovec vec[5]; - const char *fname = "data/testwritev_full.txt"; + const char *fname = "data/testwritev_full.dat"; APR_ASSERT_SUCCESS(tc, "open file for writing", apr_file_open(&f, fname, diff --git a/test/testfnmatch.c b/test/testfnmatch.c index f464f9f5b..572fd4b3e 100644 --- a/test/testfnmatch.c +++ b/test/testfnmatch.c @@ -23,7 +23,7 @@ * .txt extension in the data directory at the time testfnmatch * happens to be run (!?!). */ -#define NUM_FILES (6) +#define NUM_FILES (3) #define APR_FNM_BITS 15 #define APR_FNM_FAILBIT 256 |