diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-04-15 23:36:18 +0200 |
|---|---|---|
| committer | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2015-04-15 23:36:18 +0200 |
| commit | d388d4d09fd9d145d098a9db7fd47c0cb224ecce (patch) | |
| tree | a174089c35542f9df91b7d427352735968546794 | |
| parent | 649eb4d0b8f1576d12caac3ba384f6ea9f777975 (diff) | |
| parent | 4446b7533b3273290702b35baf5c4a87593a37a8 (diff) | |
Merge pull request #6892 from Karlson2k/mhd_upd_03
| -rw-r--r-- | project/BuildDependencies/scripts/0_package.list | 2 | ||||
| -rw-r--r-- | tools/buildsteps/win32/run-tests.bat | 5 | ||||
| -rw-r--r-- | tools/depends/target/libmicrohttpd/Makefile | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index ab64b4c94a..190af6c2c3 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/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 <testcase /> tag 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 |