summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-08-17 12:39:59 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-08-17 12:39:59 +0200
commit1e08114a73d9b79904eff1f286c765f7065bcdc0 (patch)
tree4b72544882aab37587ed883938e5a0fe3d8cc222
parentcd118006d2d1feebd92287f6379fc7f13a4d5962 (diff)
fix the compareversion test to work then called from outside of libapt
-rw-r--r--test/libapt/compareversion_test.cc7
-rwxr-xr-xtest/libapt/run-tests2
2 files changed, 7 insertions, 2 deletions
diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
index 7f192b19b..fdb1d5674 100644
--- 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)
{
+ 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]);
diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index c81520bef..c2aeccca7 100755
--- 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"
+ elif [ $name = "CompareVersion${EXT}" ]; then
+ tmppath="${DIR}/versions.lst"
fi
echo -n "Testing with \033[1;35m${name}\033[0m ... "