Move around some code to make unit tests easier to build.

This commit is contained in:
brectanus 2007-12-19 20:44:56 +00:00
parent 2103fb560b
commit 61e4623bae
4 changed files with 10 additions and 19 deletions

View File

@ -25,15 +25,6 @@
msc_engine DSOLOCAL *modsecurity = NULL;
modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
{ "dev", 1 }, /* Development build */
{ "rc", 3 }, /* Release Candidate build */
{ "", 9 }, /* Production build */
{ "breach", 9 }, /* Breach build */
{ "trunk", 9 }, /* Trunk build */
{ NULL, -1 } /* terminator */
};
/* Global module variables; these are used for the Apache-specific functionality */
char DSOLOCAL *chroot_dir = NULL;

View File

@ -16,6 +16,15 @@
#include "msc_parsers.h"
#include "msc_util.h"
modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
{ "dev", 1 }, /* Development build */
{ "rc", 3 }, /* Release Candidate build */
{ "", 9 }, /* Production build */
{ "breach", 9 }, /* Breach build */
{ "trunk", 9 }, /* Trunk build */
{ NULL, -1 } /* terminator */
};
/**
* Log an alert message to the log, adding the rule metadata at the end.
*/

View File

@ -19,15 +19,6 @@
#define BUFLEN 8192
modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
{ "dev", 1 }, /* Development build */
{ "rc", 3 }, /* Release Candidate build */
{ "", 9 }, /* Production build */
{ "breach", 9 }, /* Breach build */
{ "trunk", 9 }, /* Trunk build */
{ NULL, -1 } /* terminator */
};
#define RESULT_SUCCESS 0
#define RESULT_ERROR -1
#define RESULT_MISMATCHED -2

View File

@ -3,7 +3,7 @@ use strict;
use File::Basename qw(basename dirname);
my @TYPES = qw(tfns operators);
my $TEST = "./msc-test";
my $TEST = "./msc_test";
my $SCRIPT = basename($0);
my $SCRIPTDIR = dirname($0);
my $PASSED = 0;