mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

don't redefine GEOIP_DATA

Browse Source
This commit is contained in:
Mark Andrews
2014-09-29 09:32:59 +10:00
parent a8a5c3eb62
commit 4b92bc0022
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/dns/tests/geoip_test.c
View File

@@ -34,7 +34,7 @@
#include <GeoIP.h>
/* We use GeoIP databases from the 'geoip' system test */
#define GEOIP_DATA "../../../bin/tests/system/geoip/data"
#define TEST_GEOIP_DATA "../../../bin/tests/system/geoip/data"
/*
* Helper functions
@@ -206,7 +206,7 @@ ATF_TC_BODY(country, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.country_v4 == NULL) {
dns_test_end();
@@ -257,7 +257,7 @@ ATF_TC_BODY(country_v6, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.country_v6 == NULL) {
dns_test_end();
@@ -297,7 +297,7 @@ ATF_TC_BODY(city, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.city_v4 == NULL) {
dns_test_end();
@@ -360,7 +360,7 @@ ATF_TC_BODY(city_v6, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.city_v6 == NULL) {
dns_test_end();
@@ -419,7 +419,7 @@ ATF_TC_BODY(region, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.region == NULL) {
dns_test_end();
@@ -461,7 +461,7 @@ ATF_TC_BODY(best, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.region == NULL) {
dns_test_end();
@@ -541,7 +541,7 @@ ATF_TC_BODY(asnum, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.as == NULL) {
dns_test_end();
@@ -571,7 +571,7 @@ ATF_TC_BODY(isp, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.isp == NULL) {
dns_test_end();
@@ -600,7 +600,7 @@ ATF_TC_BODY(org, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.org == NULL) {
dns_test_end();
@@ -629,7 +629,7 @@ ATF_TC_BODY(domain, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.domain == NULL) {
dns_test_end();
@@ -658,7 +658,7 @@ ATF_TC_BODY(netspeed, tc) {
ATF_REQUIRE(result == ISC_R_SUCCESS);
/* Use databases from the geoip system test */
load_geoip(GEOIP_DATA);
load_geoip(TEST_GEOIP_DATA);
if (geoip.netspeed == NULL) {
dns_test_end();