From b4cad7373b63333077a8163bfea57e5c734142e0 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Sun, 20 Nov 2005 13:44:45 +0000 Subject: [PATCH] Restored the develplayground. Formerly named 'test' now 'devel'. Removed the devel stuff from 'testsuite'. --- Makefile.am | 3 ++ configure.ac | 33 +++++++++++----------- devel/.cvsignore | 9 ++++++ {testsuite => devel}/Example.createResolvable.cc | 0 devel/Makefile.am | 30 ++++++++++++++++++++ .../devel.ma => devel/devel.jsrain}/.cvsignore | 0 {testsuite => devel}/devel.jsrain/Makefile.am | 0 {testsuite => devel}/devel.jsrain/Msg.cc | 0 {testsuite => devel}/devel.jsrain/Patch.cc | 0 {testsuite => devel}/devel.jsrain/PatchRead.cc | 0 {testsuite => devel}/devel.jsrain/PatchSelect.cc | 0 {testsuite => devel}/devel.jsrain/Script.cc | 0 {testsuite => devel}/devel.jsrain/yum/Makefile.am | 0 .../yum/YUMParser.test/001-repomd-correct.test.xml | 0 .../001-repomd-correct.test.xml.err.ref | 0 .../YUMParser.test/001-repomd-correct.test.xml.ref | 0 .../YUMParser.test/002-primary-correct.test.xml | 0 .../002-primary-correct.test.xml.err.ref | 0 .../002-primary-correct.test.xml.ref | 0 .../YUMParser.test/003-filelists-correct.test.xml | 0 .../003-filelists-correct.test.xml.err.ref | 0 .../003-filelists-correct.test.xml.ref | 0 .../yum/YUMParser.test/004-group-correct.test.xml | 0 .../004-group-correct.test.xml.err.ref | 0 .../YUMParser.test/004-group-correct.test.xml.ref | 0 .../yum/YUMParser.test/005-other-correct.test.xml | 0 .../005-other-correct.test.xml.err.ref | 0 .../YUMParser.test/005-other-correct.test.xml.ref | 0 .../yum/YUMParser.test/006-patch-correct.test.xml | 0 .../006-patch-correct.test.xml.err.ref | 0 .../YUMParser.test/006-patch-correct.test.xml.ref | 0 .../devel.jsrain/yum/YUMParser.test/Makefile.am | 0 .../devel.jsrain/yum/YUMParser.test/README | 0 {testsuite => devel}/devel.jsrain/yum/YUMtest.cc | 0 {testsuite => devel}/devel.jsrain/yum/testit.sh | 0 .../devel.jsrain => devel/devel.ma}/.cvsignore | 0 {testsuite => devel}/devel.ma/Main.cc | 0 {testsuite => devel}/devel.ma/Makefile.am | 0 {testsuite => devel}/devel.ma/ma_test | 0 {testsuite => devel}/devel.ma/main.cc | 0 {testsuite => devel}/devel.ma/main.h | 0 {testsuite => devel}/genclass.in | 0 testsuite/.cvsignore | 3 -- testsuite/Makefile.am | 21 +------------- testsuite/tests/.cvsignore | 9 ++++++ 45 files changed, 69 insertions(+), 39 deletions(-) create mode 100644 devel/.cvsignore rename {testsuite => devel}/Example.createResolvable.cc (100%) create mode 100644 devel/Makefile.am rename {testsuite/devel.ma => devel/devel.jsrain}/.cvsignore (100%) rename {testsuite => devel}/devel.jsrain/Makefile.am (100%) rename {testsuite => devel}/devel.jsrain/Msg.cc (100%) rename {testsuite => devel}/devel.jsrain/Patch.cc (100%) rename {testsuite => devel}/devel.jsrain/PatchRead.cc (100%) rename {testsuite => devel}/devel.jsrain/PatchSelect.cc (100%) rename {testsuite => devel}/devel.jsrain/Script.cc (100%) rename {testsuite => devel}/devel.jsrain/yum/Makefile.am (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.err.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.err.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.err.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.err.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.err.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.err.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.ref (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/Makefile.am (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMParser.test/README (100%) rename {testsuite => devel}/devel.jsrain/yum/YUMtest.cc (100%) rename {testsuite => devel}/devel.jsrain/yum/testit.sh (100%) rename {testsuite/devel.jsrain => devel/devel.ma}/.cvsignore (100%) rename {testsuite => devel}/devel.ma/Main.cc (100%) rename {testsuite => devel}/devel.ma/Makefile.am (100%) rename {testsuite => devel}/devel.ma/ma_test (100%) rename {testsuite => devel}/devel.ma/main.cc (100%) rename {testsuite => devel}/devel.ma/main.h (100%) rename {testsuite => devel}/genclass.in (100%) create mode 100644 testsuite/tests/.cvsignore diff --git a/Makefile.am b/Makefile.am index 320c631..6771ea9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in ## ################################################## +# Do NOT list 'devel' in subdirs. It's developers playgound +# and must not prevent anything from building. + SUBDIRS = zypp testsuite doc ## ################################################## diff --git a/configure.ac b/configure.ac index 892e889..043e0cf 100644 --- a/configure.ac +++ b/configure.ac @@ -122,22 +122,23 @@ dnl checks for system services dnl ================================================== dnl AC_CONFIG_FILES([FILE...]) AC_OUTPUT( \ - Makefile \ - doc/Makefile \ - doc/autodoc/Makefile \ - doc/autodoc/Doxyfile \ - testsuite/Makefile \ - testsuite/lib/Makefile \ - testsuite/config/Makefile \ - testsuite/libzypp.test/Makefile \ - testsuite/tests/Makefile \ - testsuite/genclass \ - testsuite/devel.jsrain/Makefile \ - testsuite/devel.jsrain/yum/Makefile \ - testsuite/devel.ma/Makefile \ - zypp/Makefile \ - zypp/base/Makefile \ - zypp/detail/Makefile \ + Makefile \ + devel/Makefile \ + devel/genclass \ + devel/devel.jsrain/Makefile \ + devel/devel.jsrain/yum/Makefile \ + devel/devel.ma/Makefile \ + doc/Makefile \ + doc/autodoc/Makefile \ + doc/autodoc/Doxyfile \ + testsuite/Makefile \ + testsuite/lib/Makefile \ + testsuite/config/Makefile \ + testsuite/libzypp.test/Makefile \ + testsuite/tests/Makefile \ + zypp/Makefile \ + zypp/base/Makefile \ + zypp/detail/Makefile \ zypp/capability/Makefile \ zypp/parser/Makefile \ zypp/parser/yum/Makefile \ diff --git a/devel/.cvsignore b/devel/.cvsignore new file mode 100644 index 0000000..290a250 --- /dev/null +++ b/devel/.cvsignore @@ -0,0 +1,9 @@ +Makefile.in +Makefile +.deps +.libs +*.o +*.lo +*.a +*.la +genclass diff --git a/testsuite/Example.createResolvable.cc b/devel/Example.createResolvable.cc similarity index 100% rename from testsuite/Example.createResolvable.cc rename to devel/Example.createResolvable.cc diff --git a/devel/Makefile.am b/devel/Makefile.am new file mode 100644 index 0000000..fc68036 --- /dev/null +++ b/devel/Makefile.am @@ -0,0 +1,30 @@ +## Process this file with automake to produce Makefile.in +## ################################################## + +# Do NOT list devel.* in subdirs. It's developers playgound +# and must not prevent anything from building. + +SUBDIRS = + +## ################################################## + +noinst_PROGRAMS = Example.createResolvable + +## ################################################## + +LDADD = $(top_srcdir)/zypp/lib@PACKAGE@.la + +## ################################################## + +Example_createResolvable_SOURCES = Example.createResolvable.cc + +## ################################################## + +.PHONY: always + +$(noinst_PROGRAMS): $(top_srcdir)/zypp/lib@PACKAGE@.la + +$(top_srcdir)/zypp/lib@PACKAGE@.la: always + $(MAKE) -C $(top_srcdir)/zypp + +## ################################################## diff --git a/testsuite/devel.ma/.cvsignore b/devel/devel.jsrain/.cvsignore similarity index 100% rename from testsuite/devel.ma/.cvsignore rename to devel/devel.jsrain/.cvsignore diff --git a/testsuite/devel.jsrain/Makefile.am b/devel/devel.jsrain/Makefile.am similarity index 100% rename from testsuite/devel.jsrain/Makefile.am rename to devel/devel.jsrain/Makefile.am diff --git a/testsuite/devel.jsrain/Msg.cc b/devel/devel.jsrain/Msg.cc similarity index 100% rename from testsuite/devel.jsrain/Msg.cc rename to devel/devel.jsrain/Msg.cc diff --git a/testsuite/devel.jsrain/Patch.cc b/devel/devel.jsrain/Patch.cc similarity index 100% rename from testsuite/devel.jsrain/Patch.cc rename to devel/devel.jsrain/Patch.cc diff --git a/testsuite/devel.jsrain/PatchRead.cc b/devel/devel.jsrain/PatchRead.cc similarity index 100% rename from testsuite/devel.jsrain/PatchRead.cc rename to devel/devel.jsrain/PatchRead.cc diff --git a/testsuite/devel.jsrain/PatchSelect.cc b/devel/devel.jsrain/PatchSelect.cc similarity index 100% rename from testsuite/devel.jsrain/PatchSelect.cc rename to devel/devel.jsrain/PatchSelect.cc diff --git a/testsuite/devel.jsrain/Script.cc b/devel/devel.jsrain/Script.cc similarity index 100% rename from testsuite/devel.jsrain/Script.cc rename to devel/devel.jsrain/Script.cc diff --git a/testsuite/devel.jsrain/yum/Makefile.am b/devel/devel.jsrain/yum/Makefile.am similarity index 100% rename from testsuite/devel.jsrain/yum/Makefile.am rename to devel/devel.jsrain/yum/Makefile.am diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml b/devel/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml rename to devel/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.err.ref b/devel/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.err.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.err.ref rename to devel/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.err.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.ref b/devel/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.ref rename to devel/devel.jsrain/yum/YUMParser.test/001-repomd-correct.test.xml.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml b/devel/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml rename to devel/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.err.ref b/devel/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.err.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.err.ref rename to devel/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.err.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.ref b/devel/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.ref rename to devel/devel.jsrain/yum/YUMParser.test/002-primary-correct.test.xml.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml b/devel/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml rename to devel/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.err.ref b/devel/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.err.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.err.ref rename to devel/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.err.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.ref b/devel/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.ref rename to devel/devel.jsrain/yum/YUMParser.test/003-filelists-correct.test.xml.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml b/devel/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml rename to devel/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.err.ref b/devel/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.err.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.err.ref rename to devel/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.err.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.ref b/devel/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.ref rename to devel/devel.jsrain/yum/YUMParser.test/004-group-correct.test.xml.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml b/devel/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml rename to devel/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.err.ref b/devel/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.err.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.err.ref rename to devel/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.err.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.ref b/devel/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.ref rename to devel/devel.jsrain/yum/YUMParser.test/005-other-correct.test.xml.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml b/devel/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml rename to devel/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.err.ref b/devel/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.err.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.err.ref rename to devel/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.err.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.ref b/devel/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.ref similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.ref rename to devel/devel.jsrain/yum/YUMParser.test/006-patch-correct.test.xml.ref diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/Makefile.am b/devel/devel.jsrain/yum/YUMParser.test/Makefile.am similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/Makefile.am rename to devel/devel.jsrain/yum/YUMParser.test/Makefile.am diff --git a/testsuite/devel.jsrain/yum/YUMParser.test/README b/devel/devel.jsrain/yum/YUMParser.test/README similarity index 100% rename from testsuite/devel.jsrain/yum/YUMParser.test/README rename to devel/devel.jsrain/yum/YUMParser.test/README diff --git a/testsuite/devel.jsrain/yum/YUMtest.cc b/devel/devel.jsrain/yum/YUMtest.cc similarity index 100% rename from testsuite/devel.jsrain/yum/YUMtest.cc rename to devel/devel.jsrain/yum/YUMtest.cc diff --git a/testsuite/devel.jsrain/yum/testit.sh b/devel/devel.jsrain/yum/testit.sh similarity index 100% rename from testsuite/devel.jsrain/yum/testit.sh rename to devel/devel.jsrain/yum/testit.sh diff --git a/testsuite/devel.jsrain/.cvsignore b/devel/devel.ma/.cvsignore similarity index 100% rename from testsuite/devel.jsrain/.cvsignore rename to devel/devel.ma/.cvsignore diff --git a/testsuite/devel.ma/Main.cc b/devel/devel.ma/Main.cc similarity index 100% rename from testsuite/devel.ma/Main.cc rename to devel/devel.ma/Main.cc diff --git a/testsuite/devel.ma/Makefile.am b/devel/devel.ma/Makefile.am similarity index 100% rename from testsuite/devel.ma/Makefile.am rename to devel/devel.ma/Makefile.am diff --git a/testsuite/devel.ma/ma_test b/devel/devel.ma/ma_test similarity index 100% rename from testsuite/devel.ma/ma_test rename to devel/devel.ma/ma_test diff --git a/testsuite/devel.ma/main.cc b/devel/devel.ma/main.cc similarity index 100% rename from testsuite/devel.ma/main.cc rename to devel/devel.ma/main.cc diff --git a/testsuite/devel.ma/main.h b/devel/devel.ma/main.h similarity index 100% rename from testsuite/devel.ma/main.h rename to devel/devel.ma/main.h diff --git a/testsuite/genclass.in b/devel/genclass.in similarity index 100% rename from testsuite/genclass.in rename to devel/genclass.in diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore index d95b671..5c94a2f 100644 --- a/testsuite/.cvsignore +++ b/testsuite/.cvsignore @@ -6,6 +6,3 @@ Makefile *.lo *.a *.la -Main -Main.debug -genclass diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 0b227c8..19ead5d 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -1,8 +1,6 @@ ## Process this file with automake to produce Makefile.in ## ################################################## -# Do NOT list devel.* in subdirs. It's developers playgound and -# must not prevent anything from building. SUBDIRS = config lib libzypp.test tests PACKAGE=libzypp @@ -10,23 +8,6 @@ AUTOMAKE_OPTIONS = dejagnu ## ################################################## -noinst_PROGRAMS = Example.createResolvable - -## ################################################## - -LDADD = $(top_srcdir)/zypp/lib@PACKAGE@.la - -## ################################################## - -Example_createResolvable_SOURCES = Example.createResolvable.cc - -## ################################################## - -.PHONY: always - -$(noinst_PROGRAMS): $(top_srcdir)/zypp/lib@PACKAGE@.la - -$(top_srcdir)/zypp/lib@PACKAGE@.la: always - $(MAKE) -C $(top_srcdir)/zypp +#LDADD = $(top_srcdir)/zypp/lib@PACKAGE@.la ## ################################################## diff --git a/testsuite/tests/.cvsignore b/testsuite/tests/.cvsignore new file mode 100644 index 0000000..44c617e --- /dev/null +++ b/testsuite/tests/.cvsignore @@ -0,0 +1,9 @@ +Makefile.in +Makefile +.deps +.libs +*.o +*.lo +*.a +*.la +Arch -- 2.7.4