move the interactive helper to a subdirectory of test

diff --git a/test/extract-control.cc b/test/interactive-helper/extract-control.cc
similarity index 100%
rename from test/extract-control.cc
rename to test/interactive-helper/extract-control.cc

diff --git a/test/makefile b/test/interactive-helper/makefile
similarity index 70%
rename from test/makefile
rename to test/interactive-helper/makefile
index 9fcd6a8..b96139f 100644 (file)
--- a/test/makefile
+++ b/test/interactive-helper/makefile
@@ -1,9 +1,9 @@
 # -*- make -*-
-BASE=..
-SUBDIR=test
+BASE=../..
+SUBDIR=test/interactive-helper
 
 # Bring in the default rules
-include ../buildlib/defaults.mak
+include ../../buildlib/defaults.mak
 
 # Program for testing methods
 PROGRAM=mthdcat
@@ -11,13 +11,6 @@ SLIBS =
 SOURCE = mthdcat.cc
 include $(PROGRAM_H)
 
-# Scratch program to test incomplete code fragments in
-PROGRAM=scratch-test
-SLIBS = -lapt-inst -lapt-pkg
-LIB_MAKES = apt-pkg/makefile apt-inst/makefile
-SOURCE = scratch.cc
-include $(PROGRAM_H)
-
 # Version compare tester
 PROGRAM=testextract
 SLIBS = -lapt-pkg -lapt-inst
@@ -37,12 +30,6 @@ SLIBS = -lapt-pkg -lapt-inst
 SOURCE = extract-control.cc
 include $(PROGRAM_H)
 
-# Program for testing hashes
-PROGRAM=hash
-SLIBS = -lapt-pkg 
-SOURCE = hash.cc
-include $(PROGRAM_H)
-
 # Program for testing udevcdrom
 PROGRAM=test_udevcdrom
 SLIBS = -lapt-pkg 

diff --git a/test/mthdcat.cc b/test/interactive-helper/mthdcat.cc
similarity index 100%
rename from test/mthdcat.cc
rename to test/interactive-helper/mthdcat.cc

diff --git a/test/rpmver.cc b/test/interactive-helper/rpmver.cc
similarity index 100%
rename from test/rpmver.cc
rename to test/interactive-helper/rpmver.cc

diff --git a/test/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
similarity index 100%
rename from test/test_udevcdrom.cc
rename to test/interactive-helper/test_udevcdrom.cc

diff --git a/test/testdeb.cc b/test/interactive-helper/testdeb.cc
similarity index 100%
rename from test/testdeb.cc
rename to test/interactive-helper/testdeb.cc

diff --git a/test/testextract.cc b/test/interactive-helper/testextract.cc
similarity index 100%
rename from test/testextract.cc
rename to test/interactive-helper/testextract.cc