mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
Moved test 577 into the unit test framework as test 1307
This commit is contained in:
parent
80225b08cd
commit
c60a6153be
@ -60,7 +60,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
|
|||||||
test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079 \
|
test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079 \
|
||||||
test1080 test1081 test1082 test1083 test1084 test1085 test633 test634 \
|
test1080 test1081 test1082 test1083 test1084 test1085 test633 test634 \
|
||||||
test635 test636 test637 test1086 test1087 test1088 \
|
test635 test636 test637 test1086 test1087 test1088 \
|
||||||
test574 test575 test576 test577 test1113 test1114 test1089 test1090 \
|
test574 test575 test576 test1113 test1114 test1089 test1090 \
|
||||||
test1091 test1092 test1093 test1094 test1095 test1096 test1097 test560 \
|
test1091 test1092 test1093 test1094 test1095 test1096 test1097 test560 \
|
||||||
test561 test1098 test1099 test562 test563 test1100 test564 test1101 \
|
test561 test1098 test1099 test562 test563 test1100 test564 test1101 \
|
||||||
test1102 test1103 test1104 test299 test310 test311 test312 test1105 \
|
test1102 test1103 test1104 test299 test310 test311 test312 test1105 \
|
||||||
@ -70,7 +70,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
|
|||||||
test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \
|
test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \
|
||||||
test1203 test1117 test1118 test1119 test1120 test1300 test1301 test1302 \
|
test1203 test1117 test1118 test1119 test1120 test1300 test1301 test1302 \
|
||||||
test1303 test320 test321 test322 test323 test324 test1121 test581 test580 \
|
test1303 test320 test321 test322 test323 test324 test1121 test581 test580 \
|
||||||
test1304 test1305 test1306
|
test1304 test1305 test1306 test1307
|
||||||
|
|
||||||
filecheck:
|
filecheck:
|
||||||
@mkdir test-place; \
|
@mkdir test-place; \
|
||||||
|
27
tests/data/test1307
Normal file
27
tests/data/test1307
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
<testcase>
|
||||||
|
<!-- This replaces test 577 -->
|
||||||
|
<info>
|
||||||
|
<keywords>
|
||||||
|
unittest
|
||||||
|
wildcardmatch
|
||||||
|
</keywords>
|
||||||
|
</info>
|
||||||
|
|
||||||
|
#
|
||||||
|
# Client-side
|
||||||
|
<client>
|
||||||
|
<server>
|
||||||
|
none
|
||||||
|
</server>
|
||||||
|
<features>
|
||||||
|
unittest
|
||||||
|
</features>
|
||||||
|
<name>
|
||||||
|
internal Curl_fnmatch() testing
|
||||||
|
</name>
|
||||||
|
<tool>
|
||||||
|
unit1307
|
||||||
|
</tool>
|
||||||
|
</client>
|
||||||
|
|
||||||
|
</testcase>
|
@ -1,43 +0,0 @@
|
|||||||
<testcase>
|
|
||||||
<info>
|
|
||||||
<keywords>
|
|
||||||
wildcardmatch
|
|
||||||
</keywords>
|
|
||||||
</info>
|
|
||||||
#
|
|
||||||
# Server-side
|
|
||||||
<reply>
|
|
||||||
</reply>
|
|
||||||
|
|
||||||
# Client-side
|
|
||||||
<client>
|
|
||||||
<server>
|
|
||||||
none
|
|
||||||
</server>
|
|
||||||
# tool is what to use instead of 'curl'
|
|
||||||
<tool>
|
|
||||||
lib577
|
|
||||||
</tool>
|
|
||||||
# precheck is a command line to run before the test,
|
|
||||||
# to see if we can execute the test or not
|
|
||||||
<precheck>
|
|
||||||
./libtest/lib577 check
|
|
||||||
</precheck>
|
|
||||||
|
|
||||||
<name>
|
|
||||||
Curl_fnmatch() testing
|
|
||||||
</name>
|
|
||||||
<command>
|
|
||||||
nothing
|
|
||||||
</command>
|
|
||||||
</client>
|
|
||||||
|
|
||||||
#
|
|
||||||
# Verify data after the test has been "shot"
|
|
||||||
<verify>
|
|
||||||
<stdout mode="text">
|
|
||||||
===========================
|
|
||||||
===========================
|
|
||||||
</stdout>
|
|
||||||
</verify>
|
|
||||||
</testcase>
|
|
@ -8,7 +8,7 @@ SUPPORTFILES = first.c test.h
|
|||||||
noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
|
noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
|
||||||
lib507 lib508 lib510 lib511 lib512 lib513 lib514 lib515 lib516 \
|
lib507 lib508 lib510 lib511 lib512 lib513 lib514 lib515 lib516 \
|
||||||
lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \
|
lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \
|
||||||
lib574 lib575 lib576 lib577 lib578 lib579 \
|
lib574 lib575 lib576 lib578 lib579 \
|
||||||
lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \
|
lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \
|
||||||
lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \
|
lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \
|
||||||
lib539 lib557 lib560 lib562 lib564 lib565 lib566 lib567 \
|
lib539 lib557 lib560 lib562 lib564 lib565 lib566 lib567 \
|
||||||
@ -130,8 +130,6 @@ lib575_SOURCES = lib575.c $(SUPPORTFILES)
|
|||||||
|
|
||||||
lib576_SOURCES = lib576.c $(SUPPORTFILES)
|
lib576_SOURCES = lib576.c $(SUPPORTFILES)
|
||||||
|
|
||||||
lib577_SOURCES = lib577.c $(SUPPORTFILES)
|
|
||||||
|
|
||||||
lib562_SOURCES = lib562.c $(SUPPORTFILES)
|
lib562_SOURCES = lib562.c $(SUPPORTFILES)
|
||||||
|
|
||||||
lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL)
|
lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
UNITFILES = curlcheck.h
|
UNITFILES = curlcheck.h
|
||||||
|
|
||||||
# These are all unit test programs
|
# These are all unit test programs
|
||||||
noinst_PROGRAMS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305
|
noinst_PROGRAMS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307
|
||||||
|
|
||||||
unit1300_SOURCES = unit1300.c $(UNITFILES)
|
unit1300_SOURCES = unit1300.c $(UNITFILES)
|
||||||
unit1301_SOURCES = unit1301.c $(UNITFILES)
|
unit1301_SOURCES = unit1301.c $(UNITFILES)
|
||||||
@ -11,3 +11,4 @@ unit1302_SOURCES = unit1302.c $(UNITFILES)
|
|||||||
unit1303_SOURCES = unit1303.c $(UNITFILES)
|
unit1303_SOURCES = unit1303.c $(UNITFILES)
|
||||||
unit1304_SOURCES = unit1304.c $(UNITFILES)
|
unit1304_SOURCES = unit1304.c $(UNITFILES)
|
||||||
unit1305_SOURCES = unit1305.c $(UNITFILES)
|
unit1305_SOURCES = unit1305.c $(UNITFILES)
|
||||||
|
unit1307_SOURCES = unit1307.c $(UNITFILES)
|
||||||
|
@ -7,30 +7,8 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "test.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This hacky test bypasses the library external API,
|
|
||||||
* using internal only libcurl functions. So don't be
|
|
||||||
* surprised if we cannot run it when the library has
|
|
||||||
* been built with hidden symbols, exporting only the
|
|
||||||
* ones in the public API.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(CURL_HIDDEN_SYMBOLS)
|
|
||||||
# define SKIP_TEST 1
|
|
||||||
#elif defined(WIN32) && !defined(CURL_STATICLIB)
|
|
||||||
# define SKIP_TEST 1
|
|
||||||
#else
|
|
||||||
# undef SKIP_TEST
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(SKIP_TEST)
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
|
||||||
|
|
||||||
#include "curl_fnmatch.h"
|
#include "curl_fnmatch.h"
|
||||||
|
#include "curlcheck.h"
|
||||||
|
|
||||||
#define MATCH CURL_FNMATCH_MATCH
|
#define MATCH CURL_FNMATCH_MATCH
|
||||||
#define NOMATCH CURL_FNMATCH_NOMATCH
|
#define NOMATCH CURL_FNMATCH_NOMATCH
|
||||||
@ -217,39 +195,27 @@ static const struct testcase tests[] = {
|
|||||||
{ "", "", MATCH }
|
{ "", "", MATCH }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static CURLcode unit_setup( void )
|
||||||
int test(char *URL)
|
|
||||||
{
|
{
|
||||||
|
return CURLE_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unit_stop( void )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
UNITTEST_START
|
||||||
|
|
||||||
int testnum = sizeof(tests) / sizeof(struct testcase);
|
int testnum = sizeof(tests) / sizeof(struct testcase);
|
||||||
int i, rc;
|
int i, rc;
|
||||||
(void)URL; /* not used */
|
|
||||||
|
|
||||||
if(!strcmp(URL, "check")) {
|
|
||||||
/* test harness script verifying if this test can run */
|
|
||||||
return 0; /* sure, run this! */
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("===========================\n");
|
|
||||||
for(i = 0; i < testnum; i++) {
|
for(i = 0; i < testnum; i++) {
|
||||||
rc = Curl_fnmatch(NULL, tests[i].pattern, tests[i].string);
|
rc = Curl_fnmatch(NULL, tests[i].pattern, tests[i].string);
|
||||||
if(rc != tests[i].result) {
|
if(rc != tests[i].result) {
|
||||||
printf("Curl_fnmatch(\"%s\", \"%s\") should return %d (returns %d)\n",
|
printf("Curl_fnmatch(\"%s\", \"%s\") should return %d (returns %d)\n",
|
||||||
tests[i].pattern, tests[i].string, tests[i].result, rc);
|
tests[i].pattern, tests[i].string, tests[i].result, rc);
|
||||||
|
fail("pattern mismatch");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("===========================\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* !defined(SKIP_TEST) */
|
UNITTEST_STOP
|
||||||
|
|
||||||
|
|
||||||
int test(char *URL)
|
|
||||||
{
|
|
||||||
(void)URL;
|
|
||||||
fprintf(stdout, "libcurl built with hidden symbols");
|
|
||||||
return 1; /* skip test */
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* !defined(SKIP_TEST) */
|
|
Loading…
Reference in New Issue
Block a user