Move testdata/x86 to testdata/relarea/x86

Also rename testdata/x86.hints to testdata/hints/x86

90 files changed, 8 insertions, 8 deletions

diff --git a/testdata/x86.hints/release/arc/expected b/testdata/hints/x86/release/arc/expected
index d0cd27b..d0cd27b 100644
--- a/testdata/x86.hints/release/arc/expected
+++ b/testdata/hints/x86/release/arc/expected
diff --git a/testdata/x86.hints/release/base-cygwin/expected b/testdata/hints/x86/release/base-cygwin/expected
index 7505632..7505632 100644
--- a/testdata/x86.hints/release/base-cygwin/expected
+++ b/testdata/hints/x86/release/base-cygwin/expected
diff --git a/testdata/x86.hints/release/cygwin/cygwin-debuginfo/expected b/testdata/hints/x86/release/cygwin/cygwin-debuginfo/expected
index 7359321..7359321 100644
--- a/testdata/x86.hints/release/cygwin/cygwin-debuginfo/expected
+++ b/testdata/hints/x86/release/cygwin/cygwin-debuginfo/expected
diff --git a/testdata/x86.hints/release/cygwin/cygwin-devel/expected b/testdata/hints/x86/release/cygwin/cygwin-devel/expected
index 19c0b1e..19c0b1e 100644
--- a/testdata/x86.hints/release/cygwin/cygwin-devel/expected
+++ b/testdata/hints/x86/release/cygwin/cygwin-devel/expected
diff --git a/testdata/x86.hints/release/cygwin/expected b/testdata/hints/x86/release/cygwin/expected
index e2f3476..e2f3476 100644
--- a/testdata/x86.hints/release/cygwin/expected
+++ b/testdata/hints/x86/release/cygwin/expected
diff --git a/testdata/x86.hints/release/invalid/expected b/testdata/hints/x86/release/invalid/expected
index 95681a8..95681a8 100644
--- a/testdata/x86.hints/release/invalid/expected
+++ b/testdata/hints/x86/release/invalid/expected
diff --git a/testdata/x86.hints/release/keychain/expected b/testdata/hints/x86/release/keychain/expected
index 4113a2d..4113a2d 100644
--- a/testdata/x86.hints/release/keychain/expected
+++ b/testdata/hints/x86/release/keychain/expected
diff --git a/testdata/x86.hints/release/libspiro/expected b/testdata/hints/x86/release/libspiro/expected
index b16efe0..b16efe0 100644
--- a/testdata/x86.hints/release/libspiro/expected
+++ b/testdata/hints/x86/release/libspiro/expected
diff --git a/testdata/x86.hints/release/libspiro/libspiro-devel/expected b/testdata/hints/x86/release/libspiro/libspiro-devel/expected
index b16efe0..b16efe0 100644
--- a/testdata/x86.hints/release/libspiro/libspiro-devel/expected
+++ b/testdata/hints/x86/release/libspiro/libspiro-devel/expected
diff --git a/testdata/x86.hints/release/libspiro/libspiro0/expected b/testdata/hints/x86/release/libspiro/libspiro0/expected
index b16efe0..b16efe0 100644
--- a/testdata/x86.hints/release/libspiro/libspiro0/expected
+++ b/testdata/hints/x86/release/libspiro/libspiro0/expected
diff --git a/testdata/x86.hints/release/libtextcat/expected b/testdata/hints/x86/release/libtextcat/expected
index 498e7e5..498e7e5 100644
--- a/testdata/x86.hints/release/libtextcat/expected
+++ b/testdata/hints/x86/release/libtextcat/expected
diff --git a/testdata/x86.hints/release/libtextcat/libtextcat-devel/expected b/testdata/hints/x86/release/libtextcat/libtextcat-devel/expected
index aca0db6..aca0db6 100644
--- a/testdata/x86.hints/release/libtextcat/libtextcat-devel/expected
+++ b/testdata/hints/x86/release/libtextcat/libtextcat-devel/expected
diff --git a/testdata/x86.hints/release/libtextcat/libtextcat0/expected b/testdata/hints/x86/release/libtextcat/libtextcat0/expected
index 7f186d6..7f186d6 100644
--- a/testdata/x86.hints/release/libtextcat/libtextcat0/expected
+++ b/testdata/hints/x86/release/libtextcat/libtextcat0/expected
diff --git a/testdata/x86.hints/release/mDNSResponder/expected b/testdata/hints/x86/release/mDNSResponder/expected
index f02a324..f02a324 100644
--- a/testdata/x86.hints/release/mDNSResponder/expected
+++ b/testdata/hints/x86/release/mDNSResponder/expected
diff --git a/testdata/x86.hints/release/mDNSResponder/libdns_sd-devel/expected b/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/expected
index 8e93797..8e93797 100644
--- a/testdata/x86.hints/release/mDNSResponder/libdns_sd-devel/expected
+++ b/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/expected
diff --git a/testdata/x86.hints/release/mDNSResponder/libdns_sd1/expected b/testdata/hints/x86/release/mDNSResponder/libdns_sd1/expected
index 45d0032..45d0032 100644
--- a/testdata/x86.hints/release/mDNSResponder/libdns_sd1/expected
+++ b/testdata/hints/x86/release/mDNSResponder/libdns_sd1/expected
diff --git a/testdata/x86.hints/release/mingw64-i686-binutils/expected b/testdata/hints/x86/release/mingw64-i686-binutils/expected
index 114e53c..114e53c 100644
--- a/testdata/x86.hints/release/mingw64-i686-binutils/expected
+++ b/testdata/hints/x86/release/mingw64-i686-binutils/expected
diff --git a/testdata/x86.hints/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected b/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected
index c936ff6..c936ff6 100644
--- a/testdata/x86.hints/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected
+++ b/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected
diff --git a/testdata/x86.hints/release/naim/expected b/testdata/hints/x86/release/naim/expected
index 9f7710c..9f7710c 100644
--- a/testdata/x86.hints/release/naim/expected
+++ b/testdata/hints/x86/release/naim/expected
diff --git a/testdata/x86.hints/release/openssh/expected b/testdata/hints/x86/release/openssh/expected
index 8eeefad..8eeefad 100644
--- a/testdata/x86.hints/release/openssh/expected
+++ b/testdata/hints/x86/release/openssh/expected
diff --git a/testdata/x86.hints/release/proj/expected b/testdata/hints/x86/release/proj/expected
index 40db455..40db455 100644
--- a/testdata/x86.hints/release/proj/expected
+++ b/testdata/hints/x86/release/proj/expected
diff --git a/testdata/x86.hints/release/proj/libproj-devel/expected b/testdata/hints/x86/release/proj/libproj-devel/expected
index 620f019..620f019 100644
--- a/testdata/x86.hints/release/proj/libproj-devel/expected
+++ b/testdata/hints/x86/release/proj/libproj-devel/expected
diff --git a/testdata/x86.hints/release/proj/libproj1/expected b/testdata/hints/x86/release/proj/libproj1/expected
index cc05b73..cc05b73 100644
--- a/testdata/x86.hints/release/proj/libproj1/expected
+++ b/testdata/hints/x86/release/proj/libproj1/expected
diff --git a/testdata/x86.hints/release/proj/proj-debuginfo/expected b/testdata/hints/x86/release/proj/proj-debuginfo/expected
index 6af3a7b..6af3a7b 100644
--- a/testdata/x86.hints/release/proj/proj-debuginfo/expected
+++ b/testdata/hints/x86/release/proj/proj-debuginfo/expected
diff --git a/testdata/x86.hints/release/rpm-doc/expected b/testdata/hints/x86/release/rpm-doc/expected
index db48c82..db48c82 100644
--- a/testdata/x86.hints/release/rpm-doc/expected
+++ b/testdata/hints/x86/release/rpm-doc/expected
diff --git a/testdata/x86.hints/release/splint/expected b/testdata/hints/x86/release/splint/expected
index 5667e4b..5667e4b 100644
--- a/testdata/x86.hints/release/splint/expected
+++ b/testdata/hints/x86/release/splint/expected
diff --git a/testdata/x86.hints/release/testpackage/expected b/testdata/hints/x86/release/testpackage/expected
index de11656..de11656 100644
--- a/testdata/x86.hints/release/testpackage/expected
+++ b/testdata/hints/x86/release/testpackage/expected
diff --git a/testdata/x86/release/.gitignore b/testdata/relarea/x86/release/.gitignore
index 0482cb4..0482cb4 100644
--- a/testdata/x86/release/.gitignore
+++ b/testdata/relarea/x86/release/.gitignore
diff --git a/testdata/x86/release/arc/arc-4.32.7-10-src.tar.bz2 b/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2
index b56f3b9..b56f3b9 100644
--- a/testdata/x86/release/arc/arc-4.32.7-10-src.tar.bz2
+++ b/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2
diff --git a/testdata/x86/release/arc/arc-4.32.7-10.tar.bz2 b/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2
index b56f3b9..b56f3b9 100644
--- a/testdata/x86/release/arc/arc-4.32.7-10.tar.bz2
+++ b/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2
diff --git a/testdata/x86/release/arc/setup.hint b/testdata/relarea/x86/release/arc/setup.hint
index 718cb55..718cb55 100644
--- a/testdata/x86/release/arc/setup.hint
+++ b/testdata/relarea/x86/release/arc/setup.hint
diff --git a/testdata/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz b/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
+++ b/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
diff --git a/testdata/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz b/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
+++ b/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
diff --git a/testdata/x86/release/base-cygwin/setup.hint b/testdata/relarea/x86/release/base-cygwin/setup.hint
index f6f64b2..f6f64b2 100644
--- a/testdata/x86/release/base-cygwin/setup.hint
+++ b/testdata/relarea/x86/release/base-cygwin/setup.hint
diff --git a/testdata/x86/release/cygwin/.this-should-be-ignored b/testdata/relarea/x86/release/cygwin/.this-should-be-ignored
index e69de29..e69de29 100644
--- a/testdata/x86/release/cygwin/.this-should-be-ignored
+++ b/testdata/relarea/x86/release/cygwin/.this-should-be-ignored
diff --git a/testdata/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-2.2.0-1.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-2.2.1-1.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-debuginfo/setup.hint b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/setup.hint
index 5ed452c..5ed452c 100644
--- a/testdata/x86/release/cygwin/cygwin-debuginfo/setup.hint
+++ b/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/setup.hint
diff --git a/testdata/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz b/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
+++ b/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
diff --git a/testdata/x86/release/cygwin/cygwin-devel/setup.hint b/testdata/relarea/x86/release/cygwin/cygwin-devel/setup.hint
index 97170e3..97170e3 100644
--- a/testdata/x86/release/cygwin/cygwin-devel/setup.hint
+++ b/testdata/relarea/x86/release/cygwin/cygwin-devel/setup.hint
diff --git a/testdata/x86/release/cygwin/setup.hint b/testdata/relarea/x86/release/cygwin/setup.hint
index d0c4b26..d0c4b26 100644
--- a/testdata/x86/release/cygwin/setup.hint
+++ b/testdata/relarea/x86/release/cygwin/setup.hint
diff --git a/testdata/x86/release/invalid/setup.hint b/testdata/relarea/x86/release/invalid/setup.hint
index 279c8c4..279c8c4 100644
--- a/testdata/x86/release/invalid/setup.hint
+++ b/testdata/relarea/x86/release/invalid/setup.hint
diff --git a/testdata/x86/release/keychain/keychain-3.1.5-1-src.tar.xz b/testdata/relarea/x86/release/keychain/keychain-3.1.5-1-src.tar.xz
index a9d6a57..a9d6a57 100644
--- a/testdata/x86/release/keychain/keychain-3.1.5-1-src.tar.xz
+++ b/testdata/relarea/x86/release/keychain/keychain-3.1.5-1-src.tar.xz
diff --git a/testdata/x86/release/keychain/keychain-3.1.5-1.tar.xz b/testdata/relarea/x86/release/keychain/keychain-3.1.5-1.tar.xz
index ea28d9e..ea28d9e 100644
--- a/testdata/x86/release/keychain/keychain-3.1.5-1.tar.xz
+++ b/testdata/relarea/x86/release/keychain/keychain-3.1.5-1.tar.xz
diff --git a/testdata/x86/release/keychain/keychain-3.2.0-1-src.tar.xz b/testdata/relarea/x86/release/keychain/keychain-3.2.0-1-src.tar.xz
index b2241e1..b2241e1 100644
--- a/testdata/x86/release/keychain/keychain-3.2.0-1-src.tar.xz
+++ b/testdata/relarea/x86/release/keychain/keychain-3.2.0-1-src.tar.xz
diff --git a/testdata/x86/release/keychain/keychain-3.2.0-1.tar.xz b/testdata/relarea/x86/release/keychain/keychain-3.2.0-1.tar.xz
index ea28d9e..ea28d9e 100644
--- a/testdata/x86/release/keychain/keychain-3.2.0-1.tar.xz
+++ b/testdata/relarea/x86/release/keychain/keychain-3.2.0-1.tar.xz
diff --git a/testdata/x86/release/keychain/setup.hint b/testdata/relarea/x86/release/keychain/setup.hint
index 7870969..7870969 100644
--- a/testdata/x86/release/keychain/setup.hint
+++ b/testdata/relarea/x86/release/keychain/setup.hint
diff --git a/testdata/x86/release/libspiro/libspiro-devel/setup.hint b/testdata/relarea/x86/release/libspiro/libspiro-devel/setup.hint
index 37dcfd7..37dcfd7 100644
--- a/testdata/x86/release/libspiro/libspiro-devel/setup.hint
+++ b/testdata/relarea/x86/release/libspiro/libspiro-devel/setup.hint
diff --git a/testdata/x86/release/libspiro/libspiro0/setup.hint b/testdata/relarea/x86/release/libspiro/libspiro0/setup.hint
index 4d9ef6a..4d9ef6a 100644
--- a/testdata/x86/release/libspiro/libspiro0/setup.hint
+++ b/testdata/relarea/x86/release/libspiro/libspiro0/setup.hint
diff --git a/testdata/x86/release/libspiro/setup.hint b/testdata/relarea/x86/release/libspiro/setup.hint
index 42f7126..42f7126 100644
--- a/testdata/x86/release/libspiro/setup.hint
+++ b/testdata/relarea/x86/release/libspiro/setup.hint
diff --git a/testdata/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2 b/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
+++ b/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
diff --git a/testdata/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2 b/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
+++ b/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
diff --git a/testdata/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2 b/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
+++ b/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
diff --git a/testdata/x86/release/libtextcat/libtextcat-devel/setup.hint b/testdata/relarea/x86/release/libtextcat/libtextcat-devel/setup.hint
index f509126..f509126 100644
--- a/testdata/x86/release/libtextcat/libtextcat-devel/setup.hint
+++ b/testdata/relarea/x86/release/libtextcat/libtextcat-devel/setup.hint
diff --git a/testdata/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2 b/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
+++ b/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
diff --git a/testdata/x86/release/libtextcat/libtextcat0/setup.hint b/testdata/relarea/x86/release/libtextcat/libtextcat0/setup.hint
index f3ae673..f3ae673 100644
--- a/testdata/x86/release/libtextcat/libtextcat0/setup.hint
+++ b/testdata/relarea/x86/release/libtextcat/libtextcat0/setup.hint
diff --git a/testdata/x86/release/libtextcat/setup.hint b/testdata/relarea/x86/release/libtextcat/setup.hint
index 5145c2d..5145c2d 100644
--- a/testdata/x86/release/libtextcat/setup.hint
+++ b/testdata/relarea/x86/release/libtextcat/setup.hint
diff --git a/testdata/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 b/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
+++ b/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
diff --git a/testdata/x86/release/mDNSResponder/libdns_sd-devel/setup.hint b/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/setup.hint
index c285be7..c285be7 100644
--- a/testdata/x86/release/mDNSResponder/libdns_sd-devel/setup.hint
+++ b/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/setup.hint
diff --git a/testdata/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 b/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
+++ b/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
diff --git a/testdata/x86/release/mDNSResponder/libdns_sd1/setup.hint b/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/setup.hint
index 74a7a3f..74a7a3f 100644
--- a/testdata/x86/release/mDNSResponder/libdns_sd1/setup.hint
+++ b/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/setup.hint
diff --git a/testdata/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 b/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
+++ b/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
diff --git a/testdata/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 b/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
+++ b/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
diff --git a/testdata/x86/release/mDNSResponder/setup.hint b/testdata/relarea/x86/release/mDNSResponder/setup.hint
index e50938b..e50938b 100644
--- a/testdata/x86/release/mDNSResponder/setup.hint
+++ b/testdata/relarea/x86/release/mDNSResponder/setup.hint
diff --git a/testdata/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint b/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint
index 55ba552..55ba552 100644
--- a/testdata/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint
+++ b/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint
diff --git a/testdata/x86/release/mingw64-i686-binutils/setup.hint b/testdata/relarea/x86/release/mingw64-i686-binutils/setup.hint
index f911d0d..f911d0d 100644
--- a/testdata/x86/release/mingw64-i686-binutils/setup.hint
+++ b/testdata/relarea/x86/release/mingw64-i686-binutils/setup.hint
diff --git a/testdata/x86/release/naim/setup.hint b/testdata/relarea/x86/release/naim/setup.hint
index 7de6e7b..7de6e7b 100644
--- a/testdata/x86/release/naim/setup.hint
+++ b/testdata/relarea/x86/release/naim/setup.hint
diff --git a/testdata/x86/release/openssh/openssh-7.2p2-1-src.tar.xz b/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
+++ b/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
diff --git a/testdata/x86/release/openssh/openssh-7.2p2-1.tar.xz b/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/x86/release/openssh/openssh-7.2p2-1.tar.xz
+++ b/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz
diff --git a/testdata/x86/release/openssh/setup.hint b/testdata/relarea/x86/release/openssh/setup.hint
index 83aa11a..83aa11a 100644
--- a/testdata/x86/release/openssh/setup.hint
+++ b/testdata/relarea/x86/release/openssh/setup.hint
diff --git a/testdata/x86/release/proj/libproj-devel/setup.hint b/testdata/relarea/x86/release/proj/libproj-devel/setup.hint
index 76d1555..76d1555 100644
--- a/testdata/x86/release/proj/libproj-devel/setup.hint
+++ b/testdata/relarea/x86/release/proj/libproj-devel/setup.hint
diff --git a/testdata/x86/release/proj/libproj1/setup.hint b/testdata/relarea/x86/release/proj/libproj1/setup.hint
index 22a79bd..22a79bd 100644
--- a/testdata/x86/release/proj/libproj1/setup.hint
+++ b/testdata/relarea/x86/release/proj/libproj1/setup.hint
diff --git a/testdata/x86/release/proj/setup.hint b/testdata/relarea/x86/release/proj/setup.hint
index c5da485..c5da485 100644
--- a/testdata/x86/release/proj/setup.hint
+++ b/testdata/relarea/x86/release/proj/setup.hint
diff --git a/testdata/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 b/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
index cbf838c..cbf838c 100644
--- a/testdata/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
+++ b/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
diff --git a/testdata/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 b/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
index c7436b3..c7436b3 100644
--- a/testdata/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
+++ b/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
diff --git a/testdata/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2 b/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
index cbf838c..cbf838c 100644
--- a/testdata/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
+++ b/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
diff --git a/testdata/x86/release/rpm-doc/setup.hint b/testdata/relarea/x86/release/rpm-doc/setup.hint
index f3bbf78..f3bbf78 100644
--- a/testdata/x86/release/rpm-doc/setup.hint
+++ b/testdata/relarea/x86/release/rpm-doc/setup.hint
diff --git a/testdata/x86/release/splint/setup.hint b/testdata/relarea/x86/release/splint/setup.hint
index 52b56b9..52b56b9 100644
--- a/testdata/x86/release/splint/setup.hint
+++ b/testdata/relarea/x86/release/splint/setup.hint
diff --git a/testdata/x86/release/testpackage/setup.hint b/testdata/relarea/x86/release/testpackage/setup.hint
index 10ee390..10ee390 100644
--- a/testdata/x86/release/testpackage/setup.hint
+++ b/testdata/relarea/x86/release/testpackage/setup.hint
diff --git a/testdata/x86/release/testpackage/testpackage-0.1-1.tar.bz2 b/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2
index e69de29..e69de29 100644
--- a/testdata/x86/release/testpackage/testpackage-0.1-1.tar.bz2
+++ b/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2
diff --git a/tests.py b/tests.py
index 714cf1b..8f3350d 100755
--- a/tests.py
+++ b/tests.py
@@ -94,14 +94,14 @@ class TestMain(unittest.TestCase):
     def test_hint_parser(self):
         self.maxDiff = None
 
-        basedir = 'testdata/x86/release'
+        basedir = 'testdata/relarea'
         for (dirpath, subdirs, files) in os.walk(basedir):
             relpath = os.path.relpath(dirpath, basedir)
             if 'setup.hint' in files:
                 with self.subTest(package=os.path.basename(dirpath)):
                     logging.info('Reading %s' % os.path.join(dirpath, 'setup.hint'))
                     results = hint.setup_hint_parse(os.path.join(dirpath, 'setup.hint'))
-                    compare_with_expected_file(self, os.path.join('testdata/x86.hints/release', relpath), results)
+                    compare_with_expected_file(self, os.path.join('testdata/hints', relpath), results)
 
 #
 # something like "find -name results -exec sh -c 'cd `dirname {}` ; cp results
@@ -116,7 +116,7 @@ class TestMain(unittest.TestCase):
         args = types.SimpleNamespace()
         setattr(args, 'arch', 'x86')
         setattr(args, 'htdocs', htdocs)
-        setattr(args, 'rel_area', 'testdata')
+        setattr(args, 'rel_area', 'testdata/relarea')
         setattr(args, 'dryrun', False)
         setattr(args, 'force', True)
         setattr(args, 'pkglist', 'testdata/pkglist/cygwin-pkg-maint')
@@ -184,7 +184,7 @@ class TestMain(unittest.TestCase):
 
         args = types.SimpleNamespace()
         setattr(args, 'arch', 'x86')
-        setattr(args, 'rel_area', 'testdata')
+        setattr(args, 'rel_area', 'testdata/relarea')
         setattr(args, 'dryrun', False)
 
         pkglist = ['after-ready', 'not-ready', 'testpackage', 'testpackage2']
@@ -217,7 +217,7 @@ class TestMain(unittest.TestCase):
         setattr(args, 'force', True)
         setattr(args, 'inifile', 'testdata/inifile/setup.ini')
         setattr(args, 'pkglist', 'testdata/pkglist/cygwin-pkg-maint')
-        setattr(args, 'rel_area', 'testdata')
+        setattr(args, 'rel_area', 'testdata/relarea')
         setattr(args, 'release', 'testing')
         setattr(args, 'setup_version', '4.321')
 
@@ -251,7 +251,7 @@ class TestMain(unittest.TestCase):
         setattr(args, 'release', 'trial')
         setattr(args, 'setup_version', '3.1415')
 
-        shutil.copytree('testdata/x86', os.path.join(getattr(args, 'rel_area'), 'x86'))
+        shutil.copytree('testdata/relarea', getattr(args, 'rel_area'))
         shutil.copytree('testdata/homes', getattr(args, 'homedir'))
 
         # set appropriate !readys
@@ -272,9 +272,9 @@ class TestMain(unittest.TestCase):
 
 if __name__ == '__main__':
     # ensure sha512.sum files exist
-    os.system("find testdata/x86 -type d -exec sh -c 'cd {} ; sha512sum * >sha512.sum 2>/dev/null' \;")
+    os.system("find testdata/relarea/x86 -type d -exec sh -c 'cd {} ; sha512sum * >sha512.sum 2>/dev/null' \;")
     # should remove a sha512.sum file so that we test functioning when it's absent
-    os.unlink('testdata/x86/release/naim/sha512.sum')
+    os.unlink('testdata/relarea/x86/release/naim/sha512.sum')
     # remove !ready files
     os.system("find testdata/homes -name !ready -exec rm {} \;")