move *.cc files one level down

diff --git a/testsuite/solver/Makefile.am b/testsuite/solver/Makefile.am
index 0e01db1..0f16c07 100644 (file)
--- a/testsuite/solver/Makefile.am
+++ b/testsuite/solver/Makefile.am
@@ -1,24 +1,10 @@
 #
 # Makefile.am for zypp/solver/testsuite
 #
-SUBDIRS = single.out
+SUBDIRS = src single.out
 AUTOMAKE_OPTIONS = dejagnu
 PACKAGE = solver
 
-INCLUDES = -I/usr/include/libxml2
-LDADD =        $(top_srcdir)/zypp/lib@PACKAGE@.la
-
-# We're not ready for this yet.
-#check_PROGRAMS = deptestomatic.multi
-noinst_PROGRAMS = utils.single                         \
-               deptestomatic.multi
-
-utils_single_SOURCES =                                 \
-       utils_single.cc
-
-deptestomatic_multi_SOURCES =                          \
-       deptestomatic.cc
-
 EXTRA_DIST = config/*.exp                              \
            lib/*.exp                                   \
            $(PACKAGE).test/*.exp                       \

diff --git a/testsuite/solver/solver.test/multi_test.exp b/testsuite/solver/solver.test/multi_test.exp
index 4b88d33..d938c97 100644 (file)
--- a/testsuite/solver/solver.test/multi_test.exp
+++ b/testsuite/solver/solver.test/multi_test.exp
@@ -25,7 +25,7 @@
 # are expected to fail
 #
 #
-if { [catch {  set filenames [glob $srcdir/*.multi] } ] } {
+if { [catch {  set filenames [glob $srcdir/src/*.multi] } ] } {
     puts "No .multi files found"
 } else {
     # foreach file, call multi-run (from testsuite/lib)

diff --git a/testsuite/solver/solver.test/single_test.exp b/testsuite/solver/solver.test/single_test.exp
index 46551b7..f44d531 100644 (file)
--- a/testsuite/solver/solver.test/single_test.exp
+++ b/testsuite/solver/solver.test/single_test.exp
@@ -7,7 +7,7 @@
 
 # get all files matching *.single
 
-if { [catch {  set filenames [glob $srcdir/*.single] } ] } {
+if { [catch {  set filenames [glob $srcdir/src/*.single] } ] } {
     puts "No .single files found"
 } else {
     # foreach file, call single-run (from testsuite/lib)

diff --git a/testsuite/solver/src/Makefile.am b/testsuite/solver/src/Makefile.am
new file mode 100644 (file)
index 0000000..ae6bde4
--- /dev/null
+++ b/testsuite/solver/src/Makefile.am
@@ -0,0 +1,19 @@
+#
+# Makefile.am for zypp/solver/testsuite/src
+#
+
+#SUBDIRS = helix
+
+INCLUDES = -I/usr/include/libxml2
+LDADD =        $(top_srcdir)/zypp/lib@PACKAGE@.la
+
+# We're not ready for this yet.
+#check_PROGRAMS = deptestomatic.multi
+noinst_PROGRAMS = utils.single                         \
+               deptestomatic.multi
+
+utils_single_SOURCES =                                 \
+       utils_single.cc
+
+deptestomatic_multi_SOURCES =                          \
+       deptestomatic.cc

diff --git a/testsuite/solver/deptestomatic.cc b/testsuite/solver/src/deptestomatic.cc
similarity index 100%
rename from testsuite/solver/deptestomatic.cc
rename to testsuite/solver/src/deptestomatic.cc

diff --git a/testsuite/solver/utils_single.cc b/testsuite/solver/src/utils_single.cc
similarity index 100%
rename from testsuite/solver/utils_single.cc
rename to testsuite/solver/src/utils_single.cc