From aad7860eebd2dec9f044bf5e3e61c23b680a6a8c Mon Sep 17 00:00:00 2001 From: Karlson2k Date: Mon, 6 Apr 2015 20:10:33 +0300 Subject: [depends] Update libmicrohttpd to SVN 35533. Should resolve WebServer shutdown issue. --- project/BuildDependencies/scripts/0_package.list | 2 +- tools/depends/target/libmicrohttpd/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index a1de1e25a8..9a3ff2dfe8 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -26,7 +26,7 @@ libfribidi-0.19.2-win32.7z libiconv-1.14-win32-vc120.7z libjpeg-turbo-1.2.0-win32.7z liblzo-2.04-win32.7z -libmicrohttpd-svn-35383-win32-vc120.7z +libmicrohttpd-svn-35533-win32-vc120.7z libnfs-1.6.2-win32.7z libogg-vc100-1.2.0-win32.7z libplist-1.7-win32-3.7z diff --git a/tools/depends/target/libmicrohttpd/Makefile b/tools/depends/target/libmicrohttpd/Makefile index 3eb6dbf304..d00d2bad9f 100644 --- a/tools/depends/target/libmicrohttpd/Makefile +++ b/tools/depends/target/libmicrohttpd/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libmicrohttpd -VERSION=svn-35383 +VERSION=svn-35533 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz -- cgit v1.2.3 From 4446b7533b3273290702b35baf5c4a87593a37a8 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Mon, 6 Apr 2015 19:50:06 +0200 Subject: [jenkins/win32] - enable webserver unit tests --- tools/buildsteps/win32/run-tests.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/buildsteps/win32/run-tests.bat b/tools/buildsteps/win32/run-tests.bat index 1db6a50f2c..c8cdde4a37 100644 --- a/tools/buildsteps/win32/run-tests.bat +++ b/tools/buildsteps/win32/run-tests.bat @@ -68,9 +68,8 @@ ECHO Running testsuite... cd %WORKSPACE%\project\vs2010express\ set KODI_HOME=%WORKSPACE% set PATH=%WORKSPACE%\project\Win32BuildSetup\dependencies;%PATH% - rem exclude TestWebServer tests for now as those last 120 secs per test - rem not for some reason (maybe timeout?!? firewall?!? whatever...) - %EXE% --gtest_output=xml:%WORKSPACE%\gtestresults.xml --gtest_filter=-TestWebServer.* + + %EXE% --gtest_output=xml:%WORKSPACE%\gtestresults.xml rem Adapt gtest xml output to be conform with junit xml rem this basically looks for lines which have "notrun" in the tag -- cgit v1.2.3