diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-05-31 15:03:01 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-05-31 18:50:34 +0000 |
| commit | 0c0a07933d36bd26b1ef49842a51491c6ff3e721 (patch) | |
| tree | 8ed35cca36f4ccd0a7546b7d8116942f23ddae3b | |
| parent | 185e98a9bf664145d1c6d4089a7831681997bc8c (diff) | |
| download | alpine_aports-0c0a07933d36bd26b1ef49842a51491c6ff3e721.tar.bz2 alpine_aports-0c0a07933d36bd26b1ef49842a51491c6ff3e721.tar.xz alpine_aports-0c0a07933d36bd26b1ef49842a51491c6ff3e721.zip | |
main/uriparser: enable test that used to segfault
| -rw-r--r-- | main/uriparser/APKBUILD | 12 | ||||
| -rw-r--r-- | main/uriparser/disable-test.patch | 13 |
2 files changed, 3 insertions, 22 deletions
diff --git a/main/uriparser/APKBUILD b/main/uriparser/APKBUILD index 8b464470cc..a359d1b124 100644 --- a/main/uriparser/APKBUILD +++ b/main/uriparser/APKBUILD | |||
| @@ -9,12 +9,9 @@ arch="all" | |||
| 9 | license="BSD-3-Clause" | 9 | license="BSD-3-Clause" |
| 10 | makedepends="cmake gtest-dev" | 10 | makedepends="cmake gtest-dev" |
| 11 | subpackages="$pkgname-dev lib$pkgname:libs" | 11 | subpackages="$pkgname-dev lib$pkgname:libs" |
| 12 | source="https://github.com/uriparser/uriparser/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 | 12 | source="https://github.com/uriparser/uriparser/releases/download/uriparser-$pkgver/uriparser-$pkgver.tar.bz2" |
| 13 | disable-test.patch" | ||
| 14 | builddir="$srcdir/$pkgname-$pkgver" | ||
| 15 | 13 | ||
| 16 | build() { | 14 | build() { |
| 17 | cd "$builddir" | ||
| 18 | if [ "$CBUILD" != "$CHOST" ]; then | 15 | if [ "$CBUILD" != "$CHOST" ]; then |
| 19 | CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" | 16 | CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" |
| 20 | fi | 17 | fi |
| @@ -29,19 +26,16 @@ build() { | |||
| 29 | -DURIPARSER_BUILD_TOOLS=ON \ | 26 | -DURIPARSER_BUILD_TOOLS=ON \ |
| 30 | -DURIPARSER_BUILD_TESTS=ON \ | 27 | -DURIPARSER_BUILD_TESTS=ON \ |
| 31 | -DBUILD_SHARED_LIBS=ON \ | 28 | -DBUILD_SHARED_LIBS=ON \ |
| 32 | ${CMAKE_CROSSOPTS} | 29 | $CMAKE_CROSSOPTS |
| 33 | make | 30 | make |
| 34 | } | 31 | } |
| 35 | 32 | ||
| 36 | check() { | 33 | check() { |
| 37 | cd "$builddir" | ||
| 38 | make test ARGS=--verbose | 34 | make test ARGS=--verbose |
| 39 | } | 35 | } |
| 40 | 36 | ||
| 41 | package() { | 37 | package() { |
| 42 | cd "$builddir" | ||
| 43 | make DESTDIR="$pkgdir" install | 38 | make DESTDIR="$pkgdir" install |
| 44 | } | 39 | } |
| 45 | 40 | ||
| 46 | sha512sums="424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e uriparser-0.9.3.tar.bz2 | 41 | sha512sums="424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e uriparser-0.9.3.tar.bz2" |
| 47 | d4fb8786cf5580713ec5f8babfe6e4c91482e00e20c46bc700b05e8f01739ce692834b9bc7d76eabb9263afea2655a27f69cec4215ba39204a8476729fcf67f1 disable-test.patch" | ||
diff --git a/main/uriparser/disable-test.patch b/main/uriparser/disable-test.patch deleted file mode 100644 index 03c771d3d2..0000000000 --- a/main/uriparser/disable-test.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 2 | index 749fea1..b112f9b 100644 | ||
| 3 | --- a/CMakeLists.txt | ||
| 4 | +++ b/CMakeLists.txt | ||
| 5 | @@ -245,7 +245,6 @@ if(URIPARSER_BUILD_TESTS) | ||
| 6 | |||
| 7 | add_executable(testrunner | ||
| 8 | test/FourSuite.cpp | ||
| 9 | - test/MemoryManagerSuite.cpp | ||
| 10 | test/test.cpp | ||
| 11 | test/VersionSuite.cpp | ||
| 12 | |||
| 13 | |||