Sfoglia il codice sorgente

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

David Kalnischkies 15 anni fa
parent
commit
1e08114a73
2 ha cambiato i file con 7 aggiunte e 2 eliminazioni
  1. 5 2
      test/libapt/compareversion_test.cc
  2. 2 0
      test/libapt/run-tests

+ 5 - 2
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)
 {
+   if (FileExists(File) == false)
+      return _error->Error("Versiontestfile %s doesn't exist!", File);
+
    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[])
 {
-   if (argc <= 1)
-      RunTest("versions.lst");
+   if (argc != 2)
+      return 1;
    else
       RunTest(argv[1]);
 

+ 2 - 0
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"
+	elif [ $name = "CompareVersion${EXT}" ]; then
+		tmppath="${DIR}/versions.lst"
 	fi
 
 	echo -n "Testing with \033[1;35m${name}\033[0m ... "