Avoid relying on filesystem macro values in test suite

- The test-suite expected results are hardcoded, so we can't rely
  on rpm-defined macros as those reflect rpm's own configuration
  which could be something entirely different than our expectations.
- Fixes another big pile of false positives in the test suite
(cherry picked from commit 62e73943576acf19d212cac4f54b8c449c69531b)

diff --git a/tests/data/SPECS/configtest.spec b/tests/data/SPECS/configtest.spec
index 5f15c34..17dd7c9 100644 (file)
--- a/tests/data/SPECS/configtest.spec
+++ b/tests/data/SPECS/configtest.spec
@@ -1,3 +1,6 @@
+# avoid depending on rpm configuration
+%define _sysconfdir /etc
+
 %{!?filetype: %global filetype file}
 
 Name:          configtest%{?sub:-%{sub}}

diff --git a/tests/data/SPECS/conflicttest.spec b/tests/data/SPECS/conflicttest.spec
index bd1dd1c..46fbb29 100644 (file)
--- a/tests/data/SPECS/conflicttest.spec
+++ b/tests/data/SPECS/conflicttest.spec
@@ -1,3 +1,6 @@
+# avoid depending on rpm configuration
+%define _datadir /usr/share
+
 Name:          conflict%{pkg}
 Version:       1.0
 Release:       1

diff --git a/tests/data/SPECS/flangtest.spec b/tests/data/SPECS/flangtest.spec
index 3f36795..a48ba39 100644 (file)
--- a/tests/data/SPECS/flangtest.spec
+++ b/tests/data/SPECS/flangtest.spec
@@ -1,3 +1,6 @@
+# avoid depending on rpm configuration
+%define _datadir /usr/share
+
 Name:           flangtest 
 Version:        1.0
 Release:        1