Set relative directory for Travis CI

britannic · Mar 26, 2016 · ab0ec69 · ab0ec69
1 parent 789252c
commit ab0ec69
Show file tree

Hide file tree

Showing 8 changed files with 2,210 additions and 2,260 deletions.
diff --git a/global/global.go b/global/global.go
@@ -6,6 +6,7 @@
 package global
 
 import (
+	"log"
 	"os"
 	"runtime"
 
@@ -20,7 +21,6 @@ type Areas struct {
 }
 
 const (
-	cwd = "/Users/Neil/go/src/github.com/britannic/blacklist"
 
 	// DNSRestart defines the dnsmasq restart command
 	DNSRestart = "service dnsmasq restart"
@@ -40,6 +40,8 @@ var (
 		Root:    "blacklist",
 	}
 
+	cwd string
+
 	// Dbg sets the Debug flag
 	Dbg = false
 
@@ -63,10 +65,10 @@ func init() {
 	WhatOS = runtime.GOOS
 	switch WhatOS {
 	case TestOS:
-		// cwd, err := os.Getwd()
-		// if err != nil {
-		// 	log.Fatal("Cannot determine current directory - exiting")
-		// }
+		cwd, err := os.Getwd()
+		if err != nil {
+			log.Fatal("Cannot determine current directory - exiting")
+		}
 		DmsqDir = cwd + "/testdata"
 		Logfile = cwd + "/testdata/blacklist.log"
 	default:

diff --git a/testdata/blacklist.log b/testdata/blacklist.log
@@ -18685,3 +18685,13 @@ time="2016-03-25T16:34:14-07:00" level=info msg="Writing job[8] /Users/Neil/go/s
 time="2016-03-25T16:34:14-07:00" level=info msg="Writing job[6] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.winhelp2002.blacklist.conf\n" 
 time="2016-03-25T16:34:15-07:00" level=info msg="Writing job[5] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.volkerschatz.blacklist.conf\n" 
 time="2016-03-25T16:34:16-07:00" level=info msg="Writing job[3] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.openphish.blacklist.conf\n" 
+time="2016-03-25T19:23:30-07:00" level=info msg="Writing job[2] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/domains.pre-configured.blacklist.conf\n" 
+time="2016-03-25T19:23:31-07:00" level=info msg="Writing job[1] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/domains.malc0de.blacklist.conf\n" 
+time="2016-03-25T19:23:31-07:00" level=info msg="Writing job[4] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.pre-configured.blacklist.conf\n" 
+time="2016-03-25T19:23:31-07:00" level=info msg="Writing job[3] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.yoyo.blacklist.conf\n" 
+time="2016-03-25T19:23:31-07:00" level=info msg="Writing job[5] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.adaway.blacklist.conf\n" 
+time="2016-03-25T19:23:32-07:00" level=info msg="Writing job[6] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.malwaredomainlist.blacklist.conf\n" 
+time="2016-03-25T19:23:32-07:00" level=info msg="Writing job[2] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.winhelp2002.blacklist.conf\n" 
+time="2016-03-25T19:23:32-07:00" level=info msg="Writing job[8] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.someonewhocares.blacklist.conf\n" 
+time="2016-03-25T19:23:33-07:00" level=info msg="Writing job[7] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.openphish.blacklist.conf\n" 
+time="2016-03-25T19:23:33-07:00" level=info msg="Writing job[1] /Users/Neil/go/src/github.com/britannic/blacklist/testdata/hosts.volkerschatz.blacklist.conf\n" 
diff --git a/testdata/hosts.adaway.blacklist.conf b/testdata/hosts.adaway.blacklist.conf
@@ -1,21 +1,26 @@
+address=/a.admob.com/0.0.0.0
 address=/a.applovin.com/0.0.0.0
 address=/a.glcdn.co/0.0.0.0
 address=/a.medialytics.com/0.0.0.0
 address=/a.vserv.mobi/0.0.0.0
+address=/aax-us-east.amazon-adsystem.com/0.0.0.0
 address=/aax-us-west.amazon-adsystem.com/0.0.0.0
 address=/ad.leadboltapps.net/0.0.0.0
 address=/ad.leadboltmobile.net/0.0.0.0
 address=/ad.madvertise.de/0.0.0.0
 address=/ad.parrot.mable-inc.com/0.0.0.0
+address=/ad.where.com/0.0.0.0
 address=/ad1.adinfuse.com/0.0.0.0
 address=/ad2.adinfuse.com/0.0.0.0
 address=/adcontent.saymedia.com/0.0.0.0
 address=/adimg3.search.naver.net/0.0.0.0
 address=/adinfuse.com/0.0.0.0
 address=/admarvel.s3.amazonaws.com/0.0.0.0
+address=/admicro1.vcmedia.vn/0.0.0.0
 address=/admicro2.vcmedia.vn/0.0.0.0
 address=/admin.vserv.mobi/0.0.0.0
 address=/ads.adiquity.com/0.0.0.0
+address=/ads.admarvel.com/0.0.0.0
 address=/ads.admoda.com/0.0.0.0
 address=/ads.celtra.com/0.0.0.0
 address=/ads.flurry.com/0.0.0.0
@@ -24,8 +29,9 @@ address=/ads.mdotm.com/0.0.0.0
 address=/ads.mobclix.com/0.0.0.0
 address=/ads.mobgold.com/0.0.0.0
 address=/ads.mobilityware.com/0.0.0.0
+address=/ads.mopub.com/0.0.0.0
+address=/ads.mp.mydas.mobi/0.0.0.0
 address=/ads.n-ws.org/0.0.0.0
-address=/ads.saymedia.com/0.0.0.0
 address=/ads.smartdevicemedia.com/0.0.0.0
 address=/ads.vserv.mobi/0.0.0.0
 address=/ads.xxxad.net/0.0.0.0
@@ -43,10 +49,13 @@ address=/adtracker.inmobi.com/0.0.0.0
 address=/adultmoda.com/0.0.0.0
 address=/aio.lp.mydas.mobi/0.0.0.0
 address=/akamai.smartadserver.com/0.0.0.0
+address=/an.yandex.ru/0.0.0.0
+address=/analytics.admob.com/0.0.0.0
 address=/analytics.localytics.com/0.0.0.0
 address=/android-sdk31.transpera.com/0.0.0.0
 address=/android.bcfads.com/0.0.0.0
 address=/aos.wall.youmi.net/0.0.0.0
+address=/api.airpush.com/0.0.0.0
 address=/api.analytics.omgpop.com/0.0.0.0
 address=/api.yp.com/0.0.0.0
 address=/applift.com/0.0.0.0
@@ -81,6 +90,7 @@ address=/bos-tapreq17.jumptap.com/0.0.0.0
 address=/bos-tapreq18.jumptap.com/0.0.0.0
 address=/bos-tapreq19.jumptap.com/0.0.0.0
 address=/bos-tapreq20.jumptap.com/0.0.0.0
+address=/c.admob.com/0.0.0.0
 address=/c.greystripe.com/0.0.0.0
 address=/c.medialytics.com/0.0.0.0
 address=/c.vrvm.com/0.0.0.0
@@ -155,11 +165,13 @@ address=/cdn.ajillionmax.com/0.0.0.0
 address=/cdn.celtra.com/0.0.0.0
 address=/cdn.creative.medialytics.com/0.0.0.0
 address=/cdn.mdotm.com/0.0.0.0
+address=/cdn.nearbyad.com/0.0.0.0
 address=/cdn.trafficforce.com/0.0.0.0
 address=/cdn.us.goldspotmedia.com/0.0.0.0
 address=/cdn.vdopia.com/0.0.0.0
 address=/cdn1.crispadvertising.com/0.0.0.0
 address=/cdn1.inner-active.mobi/0.0.0.0
+address=/cdn1.smartadserver.com/0.0.0.0
 address=/cdn2.crispadvertising.com/0.0.0.0
 address=/china.inmobi.com/0.0.0.0
 address=/click.buzzcity.net/0.0.0.0
@@ -172,6 +184,8 @@ address=/d3anogn3pbtk4v.cloudfront.net/0.0.0.0
 address=/d3oltyb66oj2v8.cloudfront.net/0.0.0.0
 address=/data.mobclix.com/0.0.0.0
 address=/diff.smartadserver.com/0.0.0.0
+address=/diff2.smartadserver.com/0.0.0.0
+address=/diff3.smartadserver.com/0.0.0.0
 address=/dispatch.admixer.co.kr/0.0.0.0
 address=/do-not-tracker.org/0.0.0.0
 address=/edge.reporo.net/0.0.0.0
@@ -243,15 +257,14 @@ address=/go.adinfuse.com/0.0.0.0
 address=/go.mobpartner.mobi/0.0.0.0
 address=/go.vrvm.com/0.0.0.0
 address=/golds.lp.mydas.mobi/0.0.0.0
-address=/google-analytics.com/0.0.0.0
-address=/googlesyndication.com/0.0.0.0
 address=/gsmtop.net/0.0.0.0
 address=/gts-ads.twistbox.com/0.0.0.0
 address=/hhbekxxw5d9e.pflexads.com/0.0.0.0
 address=/html5adkit.plusmo.s3.amazonaws.com/0.0.0.0
 address=/hybl9bazbc35.pflexads.com/0.0.0.0
 address=/i.jumptap.com/0.0.0.0
 address=/i.tapit.com/0.0.0.0
+address=/i.w.inmobi.com/0.0.0.0
 address=/iacpromotion.s3.amazonaws.com/0.0.0.0
 address=/ifc.inmobi.com/0.0.0.0
 address=/im2.smartadserver.com/0.0.0.0
@@ -291,10 +304,14 @@ address=/mdn1.phluantmobile.net/0.0.0.0
 address=/mdn2.phluantmobile.net/0.0.0.0
 address=/mdn3.phluantmobile.net/0.0.0.0
 address=/mdn3origin.phluantmobile.net/0.0.0.0
+address=/media.admob.com/0.0.0.0
 address=/media.mobpartner.mobi/0.0.0.0
 address=/media.mydas.mobi/0.0.0.0
+address=/medrx.sensis.com.au/0.0.0.0
 address=/met.adwhirl.com/0.0.0.0
+address=/mob.adwhirl.com/0.0.0.0
 address=/mobile.banzai.it/0.0.0.0
+address=/mobileads.msn.com/0.0.0.0
 address=/mobiledl.adboe.com/0.0.0.0
 address=/mobpartner.mobi/0.0.0.0
 address=/mwc.velti.com/0.0.0.0
@@ -307,7 +324,11 @@ address=/oasc04012.247realmedia.com/0.0.0.0
 address=/orange-fr.adinfuse.com/0.0.0.0
 address=/orangeuk-mc.adinfuse.com/0.0.0.0
 address=/orencia.pflexads.com/0.0.0.0
+address=/p.admob.com/0.0.0.0
 address=/p.medialytics.com/0.0.0.0
+address=/pagead.googlesyndication.com/0.0.0.0
+address=/pagead1.googlesyndication.com/0.0.0.0
+address=/pagead2.googlesyndication.com/0.0.0.0
 address=/pdn.applovin.com/0.0.0.0
 address=/plugin.2easydroid.com/0.0.0.0
 address=/px.cdn.creative.medialytics.com/0.0.0.0
@@ -320,6 +341,7 @@ address=/req2.appads.com/0.0.0.0
 address=/req3.appads.com/0.0.0.0
 address=/rs-staticart.ybcdn.net/0.0.0.0
 address=/ru.velti.com/0.0.0.0
+address=/s.amazon-adsystem.com/0.0.0.0
 address=/s.mobclix.com/0.0.0.0
 address=/s0.2mdn.net/0.0.0.0
 address=/s3.phluant.com/0.0.0.0
@@ -357,6 +379,7 @@ address=/ww129.smartadserver.com/0.0.0.0
 address=/ww13.smartadserver.com/0.0.0.0
 address=/ww14.smartadserver.com/0.0.0.0
 address=/ww234.smartadserver.com/0.0.0.0
+address=/ww251.smartadserver.com/0.0.0.0
 address=/ww264.smartadserver.com/0.0.0.0
 address=/ww302.smartadserver.com/0.0.0.0
 address=/ww362.smartadserver.com/0.0.0.0
@@ -369,6 +392,8 @@ address=/ww84.smartadserver.com/0.0.0.0
 address=/www.eltrafiko.com/0.0.0.0
 address=/www.mmnetwork.mobi/0.0.0.0
 address=/www.pflexads.com/0.0.0.0
+address=/www.smartadserver.com/0.0.0.0
 address=/www2.smartadserver.com/0.0.0.0
 address=/www3.smartadserver.com/0.0.0.0
+address=/www4.smartadserver.com/0.0.0.0
 address=/wwww.adleads.com/0.0.0.0
diff --git a/testdata/hosts.malwaredomainlist.blacklist.conf b/testdata/hosts.malwaredomainlist.blacklist.conf
@@ -503,6 +503,7 @@ address=/jo-2012.fr/0.0.0.0
 address=/job-companybuild.tk/0.0.0.0
 address=/job-compuse.tk/0.0.0.0
 address=/josip-stadler.org/0.0.0.0
+address=/js.tongji.linezing.com/0.0.0.0
 address=/jstaikos.com/0.0.0.0
 address=/jue0jc.lukodorsai.info/0.0.0.0
 address=/juedische-kammerphilharmonie.de/0.0.0.0
@@ -1530,6 +1531,7 @@ address=/www8.0zz0.com/0.0.0.0
 address=/xamateurpornlic.www1.biz/0.0.0.0
 address=/xicaxique.com.br/0.0.0.0
 address=/xindalawyer.com/0.0.0.0
+address=/xoomer.alice.it/0.0.0.0
 address=/xorgwebs.webs.com/0.0.0.0
 address=/xotsa.frenchgerlemanelectric.com/0.0.0.0
 address=/xpornstarsckc.ddns.name/0.0.0.0