Update tests

diff --git a/test/awstats/conf/awstats.testglobal.conf b/test/awstats/conf/awstats.testglobal.conf
index b35c334cf09a564ae6dd8b52eb1e973b70f03c7d..3300ed07e5ac7b71001fbdda2007bd2df186bc3c 100644 (file)
--- a/test/awstats/conf/awstats.testglobal.conf
+++ b/test/awstats/conf/awstats.testglobal.conf
@@ -37,7 +37,7 @@
 # You can also use a pipe if log file come from a pipe.
 # Example: "gzip -d </var/log/apache/access.log.gz |"
 #
-LogFile="d:/Mes Developpements/awstats/test/log/__AWSTATS_CURRENT_CONFIG__.log"
+LogFile="/media/DATA/Mes Developpements/awstats/test/log/__AWSTATS_CURRENT_CONFIG__.log"
 
 
 # Enter the log file type you want to analyze.
@@ -110,7 +110,7 @@ LogFormat="%host %other %logname %time1 %methodurl %code %bytesd %refererquot %u
 # Example: "C:/awstats_working_dir"
 # Default: "."          (means same directory as awstats.pl)
 #
-DirData="d:/Mes Developpements/awstats/test/awstats/result"    
+DirData="/media/DATA/Mes Developpements/awstats/test/awstats/result"   
 
 # Relative or absolute web URL of your awstats.pl directory.
 # Usefull only when AWStats is used from command line.
@@ -121,7 +121,7 @@ DirCgi="/cgi-bin"
 # Relative or absolute web URL of all icons subdirectories.
 # Default: "/icon" (means you must copy icons directories in "/wwwroot/icon")
 #
-DirIcons="d:/Mes Developpements/awstats/wwwroot/icon"
+DirIcons="/media/DATA/Mes Developpements/awstats/wwwroot/icon"
 
 # If host names are already resolved in your logfile, set this to 0 will
 # increase performances.
@@ -705,7 +705,7 @@ IncludeInternalLinksInOriginSection=1
 # table with country name
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip GEOIP_STANDARD d:/Mes developpements/awstats/test/awstats/maxmind/GeoIP.dat"
+LoadPlugin="geoip GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIP.dat"
 
 # PLUGIN: GeoIP_City_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -714,7 +714,7 @@ LoadPlugin="geoip GEOIP_STANDARD d:/Mes developpements/awstats/test/awstats/maxm
 # and hits by city including regions.
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_city_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/test/awstats/maxmind/GeoIPCity-532.dat"
+LoadPlugin="geoip_city_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPCity-532.dat"
 
 # PLUGIN: GeoIP_ASN_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -734,7 +734,7 @@ LoadPlugin="geoip_city_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/test
 # Canada can be detected.
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_region_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/test/awstats/maxmind/GeoIPRegion-515.dat"
+LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPRegion-515.dat"
 
 # PLUGIN: GeoIP_ISP_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -742,7 +742,7 @@ LoadPlugin="geoip_region_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/te
 # DESCRIPTION: This plugin adds a chart of hits by ISP.
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_isp_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/test/awstats/maxmind/GeoIPISP-122.dat"
+#LoadPlugin="geoip_isp_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPISP-122.dat"
 
 # PLUGIN: GeoIP_Org_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -750,7 +750,7 @@ LoadPlugin="geoip_isp_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/test/
 # DESCRIPTION: This plugin add a chart of hits by Organization name
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_org_maxmind GEOIP_STANDARD d:/Mes developpements/awstats/test/awstats/maxmind/GeoIPOrg-111.dat"
+LoadPlugin="geoip_org_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPOrg-111.dat"
 
 
 

diff --git a/test/log/testglobal.log b/test/log/testglobal.log
index 6c810aad819a39d080fba97a012f1118c1c9868f..305ee6345d74c05c8fc57479cac445dfe4bc4a77 100644 (file)
--- a/test/log/testglobal.log
+++ b/test/log/testglobal.log
@@ -5,7 +5,7 @@
 # This sample log file contains 12 differents IPs that are :
 # Viewed traffic: 7 different true human visitors making 8 human visits
 # 23 hits on pages and 15 hits not pages (38 hits)
-# Not viewed traffic: 13 pages, 15 hits
+# Not viewed traffic: 11 pages (7 from 80.8.55.5, 1 worm, 3 special status code) , 15 hits
 # ----------------------------------------------------------------------------
 # 80.8.55.1  2 visits (start at 00:00:00 and at 12:00:00 with both entry page on /)
 #            And 2 hits to add favourites but first is non root hit with error meaning it's same "add"
@@ -60,7 +60,7 @@
 80.8.55.5 - - [01/Jan/2001:12:02:05 +0200] "GET /pagefromabot5.html HTTP/1.0" 200 7009 "-" "wget"
 80.8.55.5 - - [01/Jan/2001:12:02:05 +0200] "GET /pagefromabot6.html HTTP/1.0" 200 7009 "-" "libwww"
 
-80.8.55.6 - john [01/Jan/2001:13:00:00 +0100] "GET /cgi-bin/order.cgi?x=a&family=a&productId=998&titi=i&y=b&y=b HTTP/1.0" 200 7009 "http://www.google.com/search?sourceid=navclient&ie=utf-8&oe=utf-8&q=ma%C3%AEtre+élève" "SAGEM-myX-5m/1.0_UP.Browser/6.1.0.6.1.103_(GUI)_MMP/1.0_(Google_WAP_Proxy/1.0)"
+80.8.55.6 - john [01/Jan/2001:13:00:00 +0100] "GET /cgi-bin/order.cgi?x=a&family=a&productId=998&titi=i&y=b&y=b HTTP/1.0" 200 7009 "http://www.google.com/search?sourceid=navclient&ie=utf-8&oe=utf-8&q=ma%C3%AEtre+�l�ve" "SAGEM-myX-5m/1.0_UP.Browser/6.1.0.6.1.103_(GUI)_MMP/1.0_(Google_WAP_Proxy/1.0)"
 80.8.55.6 - john [01/Jan/2001:13:00:00 +0100] "GET /images/image1.gif HTTP/1.0" 200 364 "http://www.google.fr/search?q=cache:dccTQ_Zn4isJ:www.chiensderace.com/cgi-bin/liste_annonces.pl%3FTYPE%3D5%26ORIGINE%3Dchiensderace+labrador+chiensderace&hl=en&lr=lang_en|lang_fr&ie=UTF-8" "SAGEM-myX-5m/1.0_UP.Browser/6.1.0.6.1.103_(GUI)_MMP/1.0_(Google_WAP_Proxy/1.0)"
 80.8.55.6 - john [01/Jan/2001:13:00:00 +0100] "GET /images/image2.gif HTTP/1.0" 200 364 "http://www.google.fr/search?q=cache:dccTQ_Zn4isJ:www.chiensderace.com/cgi-bin/liste_annonces.pl%3FTYPE%3D5%26ORIGINE%3Dchiensderace+labrador+chiensderace&hl=en&lr=lang_en|lang_fr&ie=UTF-8" "SAGEM-myX-5m/1.0_UP.Browser/6.1.0.6.1.103_(GUI)_MMP/1.0_(Google_WAP_Proxy/1.0)"
 80.8.55.6 - john [01/Jan/2001:13:00:00 +0100] "GET /images/image3.gif HTTP/1.0" 200 364 "http://www.google.fr/search?q=cache:dccTQ_Zn4isJ:www.chiensderace.com/cgi-bin/liste_annonces.pl%3FTYPE%3D5%26ORIGINE%3Dchiensderace+labrador+chiensderace&hl=en&lr=lang_en|lang_fr&ie=UTF-8" "SAGEM-myX-5m/1.0_UP.Browser/6.1.0.6.1.103_(GUI)_MMP/1.0_(Google_WAP_Proxy/1.0)"

diff --git a/test/test.pl b/test/test.pl
index d75fef5677299bc67a06bdfddd06b40bde504fe7..118414206dc9460d05f327ca7888aceb9ef361bd 100644 (file)
--- a/test/test.pl
+++ b/test/test.pl
@@ -4,12 +4,12 @@
 #-----------------------------------------------------------------------------
 
 
-$DIRAWSTATS="d:/Mes Developpements/awstats/wwwroot/cgi-bin";
-$DIRCONF="d:/Mes Developpements/awstats/test/awstats/conf";
-$DIRRESULT="d:/Mes Developpements/awstats/test/awstats/result";
-$TEMP="c:/temp";
+$DIRAWSTATS="/media/DATA/Mes Developpements/awstats/wwwroot/cgi-bin";
+$DIRCONF="/media/DATA/Mes Developpements/awstats/test/awstats/conf";
+$DIRRESULT="/media/DATA/Mes Developpements/awstats/test/awstats/result";
+$TEMP="/temp";
 #$PERL="\"c:\\Program files\\cygwin\\bin\\perl.exe\"";
-$PERL="perl.exe";
+$PERL="perl";
 
 @TESTLIST=(
 "testglobal",