You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2021/03/31 19:57:07 UTC
svn commit: r1888252 - in /apr/apr/branches/1.7.x: ./ test/testfile.c
test/testfnmatch.c
Author: ylavic
Date: Wed Mar 31 19:57:06 2021
New Revision: 1888252
URL: http://svn.apache.org/viewvc?rev=1888252&view=rev
Log:
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
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/test/testfile.c
apr/apr/branches/1.7.x/test/testfnmatch.c
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1887490,1888251
Modified: apr/apr/branches/1.7.x/test/testfile.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/test/testfile.c?rev=1888252&r1=1888251&r2=1888252&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/test/testfile.c (original)
+++ apr/apr/branches/1.7.x/test/testfile.c Wed Mar 31 19:57:06 2021
@@ -606,7 +606,7 @@ static void file_contents_equal(abts_cas
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, v
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 *
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,
Modified: apr/apr/branches/1.7.x/test/testfnmatch.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/test/testfnmatch.c?rev=1888252&r1=1888251&r2=1888252&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/test/testfnmatch.c (original)
+++ apr/apr/branches/1.7.x/test/testfnmatch.c Wed Mar 31 19:57:06 2021
@@ -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