Skip to content

Commit 4db5772

Browse files
authored
Merge pull request #3 from bneradt/fix_ink_api_unit_test
Fix building of InkAPITest.cc
2 parents d3e6dd4 + 5f64c9d commit 4db5772

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

src/api/InkAPITest.cc

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,19 +1952,6 @@ REGRESSION_TEST(SDK_API_TSCache)(RegressionTest *test, int /* atype ATS_UNUSED *
19521952
*pstatus = REGRESSION_TEST_INPROGRESS;
19531953
SDK_Cache_test = test;
19541954
SDK_Cache_pstatus = pstatus;
1955-
int is_ready = 0;
1956-
1957-
// Check if Cache is ready
1958-
TSCacheReady(&is_ready);
1959-
if (!is_ready) {
1960-
SDK_RPRINT(test, "TSCacheReady", "TestCase1", TC_FAIL, "cache is not ready");
1961-
1962-
// no need to continue, return
1963-
*pstatus = REGRESSION_TEST_FAILED;
1964-
return;
1965-
} else {
1966-
SDK_RPRINT(test, "TSCacheReady", "TestCase1", TC_PASS, "ok");
1967-
}
19681955

19691956
// Create CacheKey
19701957
char key_name[] = "key_for_regression_test";
@@ -5809,7 +5796,7 @@ REGRESSION_TEST(SDK_API_TSHttpHdrParse)(RegressionTest *test, int /* atype ATS_U
58095796
//////////////////////////////////////////////
58105797

58115798
static char *
5812-
convert_mime_hdr_to_string(TSMBuffer bufp, TSMLoc hdr_loc)
5799+
convert_mime_hdr_to_string(TSMLoc hdr_loc)
58135800
{
58145801
TSIOBuffer output_buffer;
58155802
TSIOBufferReader reader;
@@ -5832,7 +5819,7 @@ convert_mime_hdr_to_string(TSMBuffer bufp, TSMLoc hdr_loc)
58325819

58335820
/* This will print just MIMEFields and not
58345821
the http request line */
5835-
TSMimeHdrPrint(bufp, hdr_loc, output_buffer);
5822+
TSMimeHdrPrint(hdr_loc, output_buffer);
58365823

58375824
/* Find out how the big the complete header is by
58385825
seeing the total bytes in the buffer. We need to
@@ -5979,7 +5966,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
59795966
SDK_RPRINT(test, "TSMimeHdrLengthGet", "TestCase1", TC_FAIL, "Cannot run test as TSMimeHdrParse returned Error.");
59805967
} else {
59815968
if (retval == TS_PARSE_DONE) {
5982-
temp = convert_mime_hdr_to_string(bufp1, mime_hdr_loc1); // Implements TSMimeHdrPrint.
5969+
temp = convert_mime_hdr_to_string(mime_hdr_loc1); // Implements TSMimeHdrPrint.
59835970
if (strcmp(parse_string, temp) == 0) {
59845971
SDK_RPRINT(test, "TSMimeHdrParse", "TestCase1", TC_PASS, "ok");
59855972
SDK_RPRINT(test, "TSMimeHdrPrint", "TestCase1", TC_PASS, "ok");
@@ -6076,7 +6063,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
60766063
if (TSMimeHdrCopy(bufp2, mime_hdr_loc2, bufp1, mime_hdr_loc1) == TS_ERROR) {
60776064
SDK_RPRINT(test, "TSMimeHdrCopy", "TestCase1", TC_FAIL, "TSMimeHdrCopy returns TS_ERROR");
60786065
} else {
6079-
temp = convert_mime_hdr_to_string(bufp2, mime_hdr_loc2); // Implements TSMimeHdrPrint.
6066+
temp = convert_mime_hdr_to_string(mime_hdr_loc2); // Implements TSMimeHdrPrint.
60806067
if (strcmp(parse_string, temp) == 0) {
60816068
SDK_RPRINT(test, "TSMimeHdrCopy", "TestCase1", TC_PASS, "ok");
60826069
test_passed_mime_hdr_copy = true;
@@ -8728,9 +8715,9 @@ std::array<std::string_view, TS_CONFIG_LAST_ENTRY> SDK_Overridable_Configs = {
87288715
"proxy.config.http.parent_proxy.per_parent_connect_attempts", "proxy.config.http.normalize_ae",
87298716
"proxy.config.http.insert_forwarded", "proxy.config.http.proxy_protocol_out",
87308717
"proxy.config.http.allow_multi_range", "proxy.config.http.request_buffer_enabled",
8731-
"proxy.config.http.allow_half_open", OutboundConnTrack::CONFIG_VAR_MIN,
8732-
OutboundConnTrack::CONFIG_VAR_MAX,
8733-
OutboundConnTrack::CONFIG_VAR_MATCH,
8718+
"proxy.config.http.allow_half_open", ConnectionTracker::CONFIG_SERVER_VAR_MIN,
8719+
ConnectionTracker::CONFIG_SERVER_VAR_MAX,
8720+
ConnectionTracker::CONFIG_SERVER_VAR_MATCH,
87348721
"proxy.config.ssl.client.verify.server.policy", "proxy.config.ssl.client.verify.server.properties",
87358722
"proxy.config.ssl.client.sni_policy", "proxy.config.ssl.client.private_key.filename",
87368723
"proxy.config.ssl.client.CA.cert.filename", "proxy.config.ssl.client.alpn_protocols",
@@ -9217,7 +9204,7 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
92179204
return;
92189205
}
92199206

9220-
REGRESSION_TEST(SDK_API_TSSslServerContextCreate)(RegressionTest *test, int level, int *pstatus)
9207+
REGRESSION_TEST(SDK_API_TSSslServerContextCreate)(RegressionTest * /* test */, int /* level */, int *pstatus)
92219208
{
92229209
TSSslContext ctx;
92239210

@@ -9228,7 +9215,7 @@ REGRESSION_TEST(SDK_API_TSSslServerContextCreate)(RegressionTest *test, int leve
92289215
TSSslContextDestroy(ctx);
92299216
}
92309217

9231-
REGRESSION_TEST(SDK_API_TSStatCreate)(RegressionTest *test, int level, int *pstatus)
9218+
REGRESSION_TEST(SDK_API_TSStatCreate)(RegressionTest *test, int /* level */, int *pstatus)
92329219
{
92339220
const char name[] = "regression.test.metric";
92349221
int id;

0 commit comments

Comments
 (0)