diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-05-06 13:42:03 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-05-06 13:42:03 +0200 |
| commit | db36c35a351a76825ae00628b74c160bc418683c (patch) | |
| tree | b0f31e19e45775f9a0880c0d4801e87077696036 /test | |
| parent | 7f0508ecc442705ac9fcbc3c2b5ac74ead18fff8 (diff) | |
| parent | 6089a4b17c61ef30b2efc00e270b0907f51f352a (diff) | |
Merge branch 'pu/merge-libraries'
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-get-install-deb | 6 | ||||
| -rw-r--r-- | test/interactive-helper/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/libapt/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb index 844f1d7c5..002c1aef8 100755 --- a/test/integration/test-apt-get-install-deb +++ b/test/integration/test-apt-get-install-deb @@ -22,9 +22,9 @@ done mv foo.rpm foo.deb for exe in apt aptget; do for cmd in install remove purge upgrade full-upgrade; do - testfailuremsg "E: Sub-process Popen returned an error code (2) -E: Encountered a section with no Package: header -E: Problem with MergeList ${TMPWORKINGDIRECTORY}/foo.deb + testfailuremsg "E: Invalid archive signature +E: Internal error, could not locate member control.tar.{zstlz4gzxzbz2lzma} +E: Could not read meta data from ${TMPWORKINGDIRECTORY}/foo.deb E: The package lists or status file could not be parsed or opened." $exe $cmd ./foo.deb done done diff --git a/test/interactive-helper/CMakeLists.txt b/test/interactive-helper/CMakeLists.txt index 5a32ca17e..f4238665d 100644 --- a/test/interactive-helper/CMakeLists.txt +++ b/test/interactive-helper/CMakeLists.txt @@ -1,9 +1,9 @@ add_executable(mthdcat mthdcat.cc) target_link_libraries(mthdcat apt-pkg) add_executable(testdeb testdeb.cc) -target_link_libraries(testdeb apt-pkg apt-inst) +target_link_libraries(testdeb apt-pkg) add_executable(extract-control extract-control.cc) -target_link_libraries(extract-control apt-pkg apt-inst) +target_link_libraries(extract-control apt-pkg) add_executable(aptwebserver aptwebserver.cc) target_link_libraries(aptwebserver apt-pkg ${CMAKE_THREAD_LIBS_INIT}) add_executable(aptdropprivs aptdropprivs.cc) diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt index 035ff07b1..57ef5ac3f 100644 --- a/test/libapt/CMakeLists.txt +++ b/test/libapt/CMakeLists.txt @@ -1,4 +1,4 @@ -set(PROJECT_TEST_LIBRARIES apt-private apt-inst) +set(PROJECT_TEST_LIBRARIES apt-private) find_path(GTEST_ROOT src/gtest.cc /usr/src/googletest/googletest /usr/src/gtest |