fix the compareversion test to work then called from outside of libapt

diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
index 7f192b19ba738103bdff0583824938221cbb8e6c..fdb1d567499c77847ca2d4efa533853b6501a8f0 100644 (file)
--- a/test/libapt/compareversion_test.cc
+++ b/test/libapt/compareversion_test.cc
@@ -63,6 +63,9 @@ void assertVersion(int const &CurLine, string const &A, string const &B, int con
 
 bool RunTest(const char *File)
 {
 
 bool RunTest(const char *File)
 {

+   if (FileExists(File) == false)
+      return _error->Error("Versiontestfile %s doesn't exist!", File);
+

    ifstream F(File,ios::in);
    if (!F != 0)
       return false;
    ifstream F(File,ios::in);
    if (!F != 0)
       return false;


@@ -112,8 +115,8 @@ bool RunTest(const char *File)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-   if (argc <= 1)
-      RunTest("versions.lst");
+   if (argc != 2)
+      return 1;

    else
       RunTest(argv[1]);
 
    else
       RunTest(argv[1]);
 

diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index c81520bef5396665e99639a22eaec0d05f8e48ca..c2aeccca7d496d648718e905858898ed8c6cfcb9 100755 (executable)
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -52,6 +52,8 @@ do
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak"
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak"

+       elif [ $name = "CompareVersion${EXT}" ]; then
+               tmppath="${DIR}/versions.lst"

        fi
 
        echo -n "Testing with \033[1;35m${name}\033[0m ... "
        fi
 
        echo -n "Testing with \033[1;35m${name}\033[0m ... "