doczkal / rpms / abrt

Forked from rpms/abrt 4 years ago
Clone

Blame SOURCES/0318-testsuite-move-examples-to-tests.patch

a60cd7
From 4e4a590283c0a69b46ca6c106fa25ab424be246c Mon Sep 17 00:00:00 2001
a60cd7
From: Martin Kutlak <mkutlak@redhat.com>
a60cd7
Date: Thu, 22 Nov 2018 13:27:06 +0100
a60cd7
Subject: [PATCH] testsuite: move examples to 'tests'
a60cd7
a60cd7
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
a60cd7
---
a60cd7
 Makefile.am                                   | 29 +----------------------------
a60cd7
 tests/Makefile.am                             | 29 ++++++++++++++++++++++++++++-
a60cd7
 {examples => tests/examples}/cut_here.right   |  0
a60cd7
 .../examples}/hash-gen-oops6.right            |  0
a60cd7
 .../examples}/hash-gen-same-as-oops6.right    |  0
a60cd7
 .../examples}/hash-gen-short-oops.right       |  0
a60cd7
 .../examples}/koops-tainted-bg1               |  0
a60cd7
 {examples => tests/examples}/koops-tainted-g  |  0
a60cd7
 .../examples}/koops-tainted-insane            |  0
a60cd7
 .../examples}/koops-tainted-spaces            |  0
a60cd7
 {examples => tests/examples}/nmi_oops.right   |  0
a60cd7
 {examples => tests/examples}/nmi_oops.test    |  0
a60cd7
 .../examples}/nmi_oops_hash.right             |  0
a60cd7
 .../examples}/nmi_oops_hash.test              |  0
a60cd7
 .../examples}/oops-kernel-3.x.x               |  0
a60cd7
 .../examples}/oops-same-as-oops4.right        |  0
a60cd7
 .../examples}/oops-with-jiffies.right         |  0
a60cd7
 .../examples}/oops-with-jiffies.test          |  0
a60cd7
 {examples => tests/examples}/oops1.right      |  0
a60cd7
 .../examples}/oops10_s390x.right              |  0
a60cd7
 .../examples}/oops10_s390x.test               |  0
a60cd7
 {examples => tests/examples}/oops4.right      |  0
a60cd7
 .../examples}/oops_broken_bios.test           |  0
a60cd7
 .../examples}/oops_recursive_locking1.right   |  0
a60cd7
 .../examples}/oops_recursive_locking1.test    |  0
a60cd7
 .../examples}/oops_unsupported_hw.test        |  0
a60cd7
 tests/koops-test.h                            |  2 +-
a60cd7
 27 files changed, 30 insertions(+), 30 deletions(-)
a60cd7
 rename {examples => tests/examples}/cut_here.right (100%)
a60cd7
 rename {examples => tests/examples}/hash-gen-oops6.right (100%)
a60cd7
 rename {examples => tests/examples}/hash-gen-same-as-oops6.right (100%)
a60cd7
 rename {examples => tests/examples}/hash-gen-short-oops.right (100%)
a60cd7
 rename {examples => tests/examples}/koops-tainted-bg1 (100%)
a60cd7
 rename {examples => tests/examples}/koops-tainted-g (100%)
a60cd7
 rename {examples => tests/examples}/koops-tainted-insane (100%)
a60cd7
 rename {examples => tests/examples}/koops-tainted-spaces (100%)
a60cd7
 rename {examples => tests/examples}/nmi_oops.right (100%)
a60cd7
 rename {examples => tests/examples}/nmi_oops.test (100%)
a60cd7
 rename {examples => tests/examples}/nmi_oops_hash.right (100%)
a60cd7
 rename {examples => tests/examples}/nmi_oops_hash.test (100%)
a60cd7
 rename {examples => tests/examples}/oops-kernel-3.x.x (100%)
a60cd7
 rename {examples => tests/examples}/oops-same-as-oops4.right (100%)
a60cd7
 rename {examples => tests/examples}/oops-with-jiffies.right (100%)
a60cd7
 rename {examples => tests/examples}/oops-with-jiffies.test (100%)
a60cd7
 rename {examples => tests/examples}/oops1.right (100%)
a60cd7
 rename {examples => tests/examples}/oops10_s390x.right (100%)
a60cd7
 rename {examples => tests/examples}/oops10_s390x.test (100%)
a60cd7
 rename {examples => tests/examples}/oops4.right (100%)
a60cd7
 rename {examples => tests/examples}/oops_broken_bios.test (100%)
a60cd7
 rename {examples => tests/examples}/oops_recursive_locking1.right (100%)
a60cd7
 rename {examples => tests/examples}/oops_recursive_locking1.test (100%)
a60cd7
 rename {examples => tests/examples}/oops_unsupported_hw.test (100%)
a60cd7
 rename {examples => tests/examples}/taint/.gitignore (100%)
a60cd7
 rename {examples => tests/examples}/taint/Makefile (100%)
a60cd7
 rename {examples => tests/examples}/taint/taint.c (100%)
a60cd7
a60cd7
diff --git a/Makefile.am b/Makefile.am
a60cd7
index b5430d133..1a9c3e4b2 100644
a60cd7
--- a/Makefile.am
a60cd7
+++ b/Makefile.am
a60cd7
@@ -4,36 +4,9 @@ SUBDIRS = src doc po icons tests apidoc
a60cd7
 DISTCHECK_CONFIGURE_FLAGS = \
a60cd7
         --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
a60cd7
 
a60cd7
-TESTSUITE_FILES =
a60cd7
-TESTSUITE_FILES += examples/koops-tainted-g
a60cd7
-TESTSUITE_FILES += examples/koops-tainted-insane
a60cd7
-TESTSUITE_FILES += examples/koops-tainted-spaces
a60cd7
-TESTSUITE_FILES += examples/cut_here.right
a60cd7
-TESTSUITE_FILES += examples/oops-kernel-3.x.x
a60cd7
-TESTSUITE_FILES += examples/oops1.right
a60cd7
-TESTSUITE_FILES += examples/koops-tainted-bg1
a60cd7
-TESTSUITE_FILES += examples/oops-same-as-oops4.right
a60cd7
-TESTSUITE_FILES += examples/oops4.right
a60cd7
-TESTSUITE_FILES += examples/oops-same-as-oops4.right
a60cd7
-TESTSUITE_FILES += examples/hash-gen-oops6.right
a60cd7
-TESTSUITE_FILES += examples/hash-gen-short-oops.right
a60cd7
-TESTSUITE_FILES += examples/hash-gen-same-as-oops6.right
a60cd7
-TESTSUITE_FILES += examples/oops-with-jiffies.test
a60cd7
-TESTSUITE_FILES += examples/oops-with-jiffies.right
a60cd7
-TESTSUITE_FILES += examples/oops_recursive_locking1.test
a60cd7
-TESTSUITE_FILES += examples/oops_recursive_locking1.right
a60cd7
-TESTSUITE_FILES += examples/nmi_oops.test
a60cd7
-TESTSUITE_FILES += examples/nmi_oops.right
a60cd7
-TESTSUITE_FILES += examples/nmi_oops_hash.test
a60cd7
-TESTSUITE_FILES += examples/nmi_oops_hash.right
a60cd7
-TESTSUITE_FILES += examples/oops10_s390x.test
a60cd7
-TESTSUITE_FILES += examples/oops10_s390x.right
a60cd7
-TESTSUITE_FILES += examples/oops_unsupported_hw.test
a60cd7
-TESTSUITE_FILES += examples/oops_broken_bios.test
a60cd7
-
a60cd7
 
a60cd7
 EXTRA_DIST = doc/coding-style abrt.spec.in abrt.pc.in \
a60cd7
-	abrt-version asciidoc.conf init-scripts/* $(TESTSUITE_FILES) \
a60cd7
+	abrt-version asciidoc.conf init-scripts/* \
a60cd7
 	augeas/test_abrt.aug
a60cd7
 
a60cd7
 pkgconfigdir = $(libdir)/pkgconfig
a60cd7
diff --git a/tests/Makefile.am b/tests/Makefile.am
a60cd7
index 416f579b7..1e1b63376 100644
a60cd7
--- a/tests/Makefile.am
a60cd7
+++ b/tests/Makefile.am
a60cd7
@@ -24,6 +24,33 @@ EXTRA_DIST = package.m4 ignored_problems_data
a60cd7
 ## Test suite.  ##
a60cd7
 ## ------------ ##
a60cd7
 
a60cd7
+TESTSUITE_FILES =
a60cd7
+TESTSUITE_FILES += examples/koops-tainted-g
a60cd7
+TESTSUITE_FILES += examples/koops-tainted-insane
a60cd7
+TESTSUITE_FILES += examples/koops-tainted-spaces
a60cd7
+TESTSUITE_FILES += examples/cut_here.right
a60cd7
+TESTSUITE_FILES += examples/oops-kernel-3.x.x
a60cd7
+TESTSUITE_FILES += examples/oops1.right
a60cd7
+TESTSUITE_FILES += examples/koops-tainted-bg1
a60cd7
+TESTSUITE_FILES += examples/oops-same-as-oops4.right
a60cd7
+TESTSUITE_FILES += examples/oops4.right
a60cd7
+TESTSUITE_FILES += examples/oops-same-as-oops4.right
a60cd7
+TESTSUITE_FILES += examples/hash-gen-oops6.right
a60cd7
+TESTSUITE_FILES += examples/hash-gen-short-oops.right
a60cd7
+TESTSUITE_FILES += examples/hash-gen-same-as-oops6.right
a60cd7
+TESTSUITE_FILES += examples/oops-with-jiffies.test
a60cd7
+TESTSUITE_FILES += examples/oops-with-jiffies.right
a60cd7
+TESTSUITE_FILES += examples/oops_recursive_locking1.test
a60cd7
+TESTSUITE_FILES += examples/oops_recursive_locking1.right
a60cd7
+TESTSUITE_FILES += examples/nmi_oops.test
a60cd7
+TESTSUITE_FILES += examples/nmi_oops.right
a60cd7
+TESTSUITE_FILES += examples/nmi_oops_hash.test
a60cd7
+TESTSUITE_FILES += examples/nmi_oops_hash.right
a60cd7
+TESTSUITE_FILES += examples/oops10_s390x.test
a60cd7
+TESTSUITE_FILES += examples/oops10_s390x.right
a60cd7
+TESTSUITE_FILES += examples/oops_unsupported_hw.test
a60cd7
+TESTSUITE_FILES += examples/oops_broken_bios.test
a60cd7
+
a60cd7
 TESTSUITE_AT = \
a60cd7
   local.at \
a60cd7
   testsuite.at \
a60cd7
@@ -32,7 +59,7 @@ TESTSUITE_AT = \
a60cd7
   ignored_problems.at \
a60cd7
   hooklib.at
a60cd7
 
a60cd7
-EXTRA_DIST += $(TESTSUITE_AT)
a60cd7
+EXTRA_DIST += $(TESTSUITE_AT) $(TESTSUITE_FILES)
a60cd7
 TESTSUITE = $(srcdir)/testsuite
a60cd7
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
a60cd7
 check_DATA = atconfig atlocal $(TESTSUITE)
a60cd7
diff --git a/examples/cut_here.right b/tests/examples/cut_here.right
a60cd7
similarity index 100%
a60cd7
rename from examples/cut_here.right
a60cd7
rename to tests/examples/cut_here.right
a60cd7
diff --git a/examples/hash-gen-oops6.right b/tests/examples/hash-gen-oops6.right
a60cd7
similarity index 100%
a60cd7
rename from examples/hash-gen-oops6.right
a60cd7
rename to tests/examples/hash-gen-oops6.right
a60cd7
diff --git a/examples/hash-gen-same-as-oops6.right b/tests/examples/hash-gen-same-as-oops6.right
a60cd7
similarity index 100%
a60cd7
rename from examples/hash-gen-same-as-oops6.right
a60cd7
rename to tests/examples/hash-gen-same-as-oops6.right
a60cd7
diff --git a/examples/hash-gen-short-oops.right b/tests/examples/hash-gen-short-oops.right
a60cd7
similarity index 100%
a60cd7
rename from examples/hash-gen-short-oops.right
a60cd7
rename to tests/examples/hash-gen-short-oops.right
a60cd7
diff --git a/examples/koops-tainted-bg1 b/tests/examples/koops-tainted-bg1
a60cd7
similarity index 100%
a60cd7
rename from examples/koops-tainted-bg1
a60cd7
rename to tests/examples/koops-tainted-bg1
a60cd7
diff --git a/examples/koops-tainted-g b/tests/examples/koops-tainted-g
a60cd7
similarity index 100%
a60cd7
rename from examples/koops-tainted-g
a60cd7
rename to tests/examples/koops-tainted-g
a60cd7
diff --git a/examples/koops-tainted-insane b/tests/examples/koops-tainted-insane
a60cd7
similarity index 100%
a60cd7
rename from examples/koops-tainted-insane
a60cd7
rename to tests/examples/koops-tainted-insane
a60cd7
diff --git a/examples/koops-tainted-spaces b/tests/examples/koops-tainted-spaces
a60cd7
similarity index 100%
a60cd7
rename from examples/koops-tainted-spaces
a60cd7
rename to tests/examples/koops-tainted-spaces
a60cd7
diff --git a/examples/nmi_oops.right b/tests/examples/nmi_oops.right
a60cd7
similarity index 100%
a60cd7
rename from examples/nmi_oops.right
a60cd7
rename to tests/examples/nmi_oops.right
a60cd7
diff --git a/examples/nmi_oops.test b/tests/examples/nmi_oops.test
a60cd7
similarity index 100%
a60cd7
rename from examples/nmi_oops.test
a60cd7
rename to tests/examples/nmi_oops.test
a60cd7
diff --git a/examples/nmi_oops_hash.right b/tests/examples/nmi_oops_hash.right
a60cd7
similarity index 100%
a60cd7
rename from examples/nmi_oops_hash.right
a60cd7
rename to tests/examples/nmi_oops_hash.right
a60cd7
diff --git a/examples/nmi_oops_hash.test b/tests/examples/nmi_oops_hash.test
a60cd7
similarity index 100%
a60cd7
rename from examples/nmi_oops_hash.test
a60cd7
rename to tests/examples/nmi_oops_hash.test
a60cd7
diff --git a/examples/oops-kernel-3.x.x b/tests/examples/oops-kernel-3.x.x
a60cd7
similarity index 100%
a60cd7
rename from examples/oops-kernel-3.x.x
a60cd7
rename to tests/examples/oops-kernel-3.x.x
a60cd7
diff --git a/examples/oops-same-as-oops4.right b/tests/examples/oops-same-as-oops4.right
a60cd7
similarity index 100%
a60cd7
rename from examples/oops-same-as-oops4.right
a60cd7
rename to tests/examples/oops-same-as-oops4.right
a60cd7
diff --git a/examples/oops-with-jiffies.right b/tests/examples/oops-with-jiffies.right
a60cd7
similarity index 100%
a60cd7
rename from examples/oops-with-jiffies.right
a60cd7
rename to tests/examples/oops-with-jiffies.right
a60cd7
diff --git a/examples/oops-with-jiffies.test b/tests/examples/oops-with-jiffies.test
a60cd7
similarity index 100%
a60cd7
rename from examples/oops-with-jiffies.test
a60cd7
rename to tests/examples/oops-with-jiffies.test
a60cd7
diff --git a/examples/oops1.right b/tests/examples/oops1.right
a60cd7
similarity index 100%
a60cd7
rename from examples/oops1.right
a60cd7
rename to tests/examples/oops1.right
a60cd7
diff --git a/examples/oops10_s390x.right b/tests/examples/oops10_s390x.right
a60cd7
similarity index 100%
a60cd7
rename from examples/oops10_s390x.right
a60cd7
rename to tests/examples/oops10_s390x.right
a60cd7
diff --git a/examples/oops10_s390x.test b/tests/examples/oops10_s390x.test
a60cd7
similarity index 100%
a60cd7
rename from examples/oops10_s390x.test
a60cd7
rename to tests/examples/oops10_s390x.test
a60cd7
diff --git a/examples/oops4.right b/tests/examples/oops4.right
a60cd7
similarity index 100%
a60cd7
rename from examples/oops4.right
a60cd7
rename to tests/examples/oops4.right
a60cd7
diff --git a/examples/oops_broken_bios.test b/tests/examples/oops_broken_bios.test
a60cd7
similarity index 100%
a60cd7
rename from examples/oops_broken_bios.test
a60cd7
rename to tests/examples/oops_broken_bios.test
a60cd7
diff --git a/examples/oops_recursive_locking1.right b/tests/examples/oops_recursive_locking1.right
a60cd7
similarity index 100%
a60cd7
rename from examples/oops_recursive_locking1.right
a60cd7
rename to tests/examples/oops_recursive_locking1.right
a60cd7
diff --git a/examples/oops_recursive_locking1.test b/tests/examples/oops_recursive_locking1.test
a60cd7
similarity index 100%
a60cd7
rename from examples/oops_recursive_locking1.test
a60cd7
rename to tests/examples/oops_recursive_locking1.test
a60cd7
diff --git a/examples/oops_unsupported_hw.test b/tests/examples/oops_unsupported_hw.test
a60cd7
similarity index 100%
a60cd7
rename from examples/oops_unsupported_hw.test
a60cd7
rename to tests/examples/oops_unsupported_hw.test
a60cd7
diff --git a/tests/koops-test.h b/tests/koops-test.h
a60cd7
index 53787aa62..58f4ede01 100644
a60cd7
--- a/tests/koops-test.h
a60cd7
+++ b/tests/koops-test.h
a60cd7
@@ -18,7 +18,7 @@
a60cd7
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
a60cd7
 */
a60cd7
 
a60cd7
-#define EXAMPLE_PFX "../../../examples"
a60cd7
+#define EXAMPLE_PFX "../../examples"
a60cd7
 
a60cd7
 struct test_struct {
a60cd7
         const char *filename;
a60cd7
-- 
a60cd7
2.17.2
a60cd7