Merge remote-tracking branch 'mvo/feature/apt-manpage' into debian/sid

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

diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index 6ab30ba6727d9ad5520bfe954940a97c7b5a0de0..71aa54f1ee94ff7dd21a413b06f088f96e74e00d 100644 (file)
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -1,15 +1,20 @@
+#include <config.h>
+
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/sourcelist.h>
-#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
 
-#include "assert.h"
+#include <string>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "assert.h"
+
 char *tempfile = NULL;
 int tempfile_fd = -1;
 
-void remove_tmpfile(void)
+static void remove_tmpfile(void)
 {
    if (tempfile_fd > 0)
       close(tempfile_fd);
@@ -19,8 +24,10 @@ void remove_tmpfile(void)
    }
 }
 
-int main(int argc, char *argv[])
+int main()
 {
+  _config->Set("APT::Sources::Use-Deb822", true);
+
    const char contents[] = ""
       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
@@ -36,6 +43,7 @@ int main(int argc, char *argv[])
       ;
 
    FileFd fd;
+   atexit(remove_tmpfile);
    tempfile = strdup("apt-test.XXXXXXXX");
    tempfile_fd = mkstemp(tempfile);