]> git.saurik.com Git - apt.git/commitdiff
fix tests
authorMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 20:34:34 +0000 (22:34 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 20:34:34 +0000 (22:34 +0200)
test/integration/test-bug-683786-build-dep-on-virtual-packages
test/integration/test-ubuntu-bug-346386-apt-get-update-paywall

index 879d6a3bce2b97f25bdefe6a2a1aa78207d9adb3..65862c572b55b465d781bd4a157277a40579dba0 100755 (executable)
@@ -38,8 +38,8 @@ Building dependency tree...
 The following NEW packages will be installed:
   po-debconf
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   po-debconf
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Inst po-debconf (1 unstable, unstable [all])
-Conf po-debconf (1 unstable, unstable [all])' aptget build-dep dash -s
+Inst po-debconf (1 unstable [all])
+Conf po-debconf (1 unstable [all])' aptget build-dep dash -s
 
 testequal 'Reading package lists...
 Building dependency tree...
 
 testequal 'Reading package lists...
 Building dependency tree...
index 7112d2b45364691f7924dbaacc16ac118099972a..1a7db0adc36bc7ab63e058ba254aaf598bc123dd 100755 (executable)
@@ -22,7 +22,7 @@ Config-Item: Acquire::http::DependOnSTDIN=0
 600 Acquire URI
 URI: http://localhost:8080/holygrail
 Filename: knights-talking
 600 Acquire URI
 URI: http://localhost:8080/holygrail
 Filename: knights-talking
-' | ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail
+' | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail
 testfileequal knights-talking 'ni ni ni'
 
 ensure_n_canary_strings_in_dir() {
 testfileequal knights-talking 'ni ni ni'
 
 ensure_n_canary_strings_in_dir() {