On 12/14/2016 08:37 PM, [email protected] wrote: > Author: jchampion > Date: Wed Dec 14 19:37:03 2016 > New Revision: 1774328 > > URL: http://svn.apache.org/viewvc?rev=1774328&view=rev > Log: > PR60478: add test case > > Includes a utility ap_expr function to determine the length of a string > argument. > > Added: > httpd/test/framework/trunk/c-modules/test_utilities/ > httpd/test/framework/trunk/c-modules/test_utilities/mod_test_utilities.c > (with props) > Modified: > httpd/test/framework/trunk/t/conf/extra.conf.in > httpd/test/framework/trunk/t/modules/rewrite.t > > Added: > httpd/test/framework/trunk/c-modules/test_utilities/mod_test_utilities.c > URL: > http://svn.apache.org/viewvc/httpd/test/framework/trunk/c-modules/test_utilities/mod_test_utilities.c?rev=1774328&view=auto > ============================================================================== > --- httpd/test/framework/trunk/c-modules/test_utilities/mod_test_utilities.c > (added) > +++ httpd/test/framework/trunk/c-modules/test_utilities/mod_test_utilities.c > Wed Dec 14 19:37:03 2016 > @@ -0,0 +1,48 @@ > +/** > + * This module provides utility functions for other tests; it doesn't provide > + * test cases of its own. > + */ > + > +#define HTTPD_TEST_REQUIRE_APACHE 2 > + > +#define APACHE_HTTPD_TEST_EXTRA_HOOKS util_register_hooks > +#include "apache_httpd_test.h" > + > +#include "apr_strings.h" > +#include "ap_expr.h" > + > +/** > + * The util_strlen() ap_expr function simply returns the length of its string > + * argument as a decimal string. > + */ > +static const char *util_strlen_func(ap_expr_eval_ctx_t *ctx, const void > *data, > + const char *arg) > +{ > + if (!arg) { > + return NULL; > + } > + > + return apr_psprintf(ctx->p, "%" APR_SIZE_T_FMT, strlen(arg)); > +} > + > +static int util_expr_lookup(ap_expr_lookup_parms *parms) > +{ > + switch (parms->type) { > + case AP_EXPR_FUNC_STRING: > + if (!strcasecmp(parms->name, "util_strlen")) { > + *parms->func = util_strlen_func; > + *parms->data = "dummy"; > + return OK; > + } > + break; > + } > + > + return DECLINED; > +} > + > +static void util_register_hooks(apr_pool_t *p) > +{ > + ap_hook_expr_lookup(util_expr_lookup, NULL, NULL, APR_HOOK_MIDDLE); > +}
This breaks the test suite for httpd 2.2.x.: mod_test_utilities.c:12:21: error: ap_expr.h: No such file or directory mod_test_utilities.c:18: error: expected ‘)’ before ‘*’ token mod_test_utilities.c:28: error: expected ‘)’ before ‘*’ token mod_test_utilities.c: In function ‘util_register_hooks’: mod_test_utilities.c:45: warning: implicit declaration of function ‘ap_hook_expr_lookup’ mod_test_utilities.c:45: error: ‘util_expr_lookup’ undeclared (first use in this function) mod_test_utilities.c:45: error: (Each undeclared identifier is reported only once mod_test_utilities.c:45: error: for each function it appears in.) apxs:Error: Command failed with rc=65536 Regards Rüdiger
