merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / test / libapt / parsedepends_test.cc

diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index 7b496878ddaf55b50985f22b89a48ed7752b5562..677b1c89263756221358a96fd1169610db0558ed 100644 (file)
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -4,13 +4,13 @@
 #include "assert.h"
 
 int main(int argc,char *argv[]) {
 #include "assert.h"
 
 int main(int argc,char *argv[]) {

-       string Package;
-       string Version;
+       std::string Package;
+       std::string Version;

        unsigned int Op = 5;
        unsigned int Null = 0;
        bool StripMultiArch = true;
        bool ParseArchFlags = false;
        unsigned int Op = 5;
        unsigned int Null = 0;
        bool StripMultiArch = true;
        bool ParseArchFlags = false;

-       _config->Set("APT::Architecture","dsk");
+       _config->Set("APT::Architecture","amd64");

 
        const char* Depends =
                "debhelper:any (>= 5.0), "
 
        const char* Depends =
                "debhelper:any (>= 5.0), "


@@ -19,13 +19,13 @@ int main(int argc,char *argv[]) {
                "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), "
                "debiandoc-sgml, "
                "apt (>= 0.7.25), "
                "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), "
                "debiandoc-sgml, "
                "apt (>= 0.7.25), "

-               "not-for-me [ !dsk ], "
-               "only-for-me [ dsk ], "
+               "not-for-me [ !amd64 ], "
+               "only-for-me [ amd64 ], "

                "any-for-me [ any ], "
                "not-for-darwin [ !darwin-any ], "
                "any-for-me [ any ], "
                "not-for-darwin [ !darwin-any ], "

-               "cpu-for-me [ any-dsk ], "
+               "cpu-for-me [ any-amd64 ], "

                "os-for-me [ linux-any ], "
                "os-for-me [ linux-any ], "

-               "cpu-not-for-me [ any-amd64 ], "
+               "cpu-not-for-me [ any-armel ], "

                "os-not-for-me [ kfreebsd-any ], "
                "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), "
        ;
                "os-not-for-me [ kfreebsd-any ], "
                "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), "
        ;