Port test.sh to testscript

130 files changed, 0 insertions, 616 deletions

diff --git a/tests/pkg/.gitignore b/tests/pkg/.gitignore
deleted file mode 100644
index cd1ec36..0000000
--- a/tests/pkg/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-packages
-signature
diff --git a/tests/pkg/1/build2.org/auth/create-expired/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/create-expired/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/create-expired/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/create-expired/repositories b/tests/pkg/1/build2.org/auth/create-expired/repositories
deleted file mode 100644
index 8370fa4..0000000
--- a/tests/pkg/1/build2.org/auth/create-expired/repositories
+++ /dev/null
@@ -1,33 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFLzCCAxegAwIBAgIJAPIoh0763iYdMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoMDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDDA9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNTAxMTA1MDMyWhcNMTYwNTAyMTA1MDMyWjAzMRcwFQYDVQQKDA5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAwwPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaNGMEQwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMBoGA1UdEQQTMBGBD2luZm9AYnVpbGQyLm9yZzANBgkqhkiG9w0BAQsFAAOC
-AgEAAb+Yxvqi4sOZ+Ti8wcxkxqFrIs32M3XgJIeZYJn9JZbtjuBx0JFZWnL/tz4M
-VTiM2nrUc4qIIpTqEt2If1NcdH0Cjvf6vysLvIOoB4q09B+aW4F+19moixYodoDp
-qq1Ki1MZrBMx+KUICagqRSklPyxaZ2rEFv2TY0pg8/QRFRWGCFgdWJleX6VsqIXC
-KDK6MyHfR1gsDnZZfgr7HJCq1SH3loqlchLBvAF6K/c1LdQyJFYoP4xAt6yaQWzv
-wEqqhhZ7tLpjrjK0K2pqsPoupNcNhE31k+6ZdM5Z5oHT844qKIVNJIdlvFwnQ3ed
-grP6gBCLVY7h7GJ0x2ZG/2hYt4My8RqLxFYHaHAzQsmXFATIzT1Yqz1nw+8V3l5P
-m+rXQNVAw7rgpl3T7klbHVfkg5rPa0kF66PkKq5ax46NS6KVj9sNOqkcXL7huQSG
-BnSLTkaLwwrSZWl+DPXeY8TgUGkkEMY6RvYdqoOGZiZSqtMfK9QKsFi79a4Munc8
-ypUPxE++jhtXcarDy0ta3BXrspIg63a2Ab6C5yv2fC31Ec5v75rUxt9BVxMMQdlX
-h9eMe5FmkgkSBcklOShE2kZvTOPUCSq8DK7JuKsKEH3istPto+PpoyT8RxuZ9K2Q
-rr78CskHtj+TVdFv7TAqn2YDx9ki4HJIxWKVanJ+zOBSrJw=
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/create-noemail/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/create-noemail/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/create-noemail/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/create-noemail/repositories b/tests/pkg/1/build2.org/auth/create-noemail/repositories
deleted file mode 100644
index 3645b23..0000000
--- a/tests/pkg/1/build2.org/auth/create-noemail/repositories
+++ /dev/null
@@ -1,33 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFEzCCAvugAwIBAgIJANxwhIzYRCmBMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoMDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDDA9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNTAxMTYwODQyWhcNMTcwNTAxMTYwODQyWjAzMRcwFQYDVQQKDA5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAwwPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaMqMCgwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMA0GCSqGSIb3DQEBCwUAA4ICAQC4bolUadknEL7ryAGisjFxK0WkH4zNDGrV
-c3c27jHfr7D/GXqMvAkpE9aXwbBDTkgmsvQMkLx4on1WewLFVuDfyvqAS2IGU9i4
-7bbCaACkrhEb1PYvZ8mbVJiXSfnwHSmbEeBbVlej9OqFga2+drv2cI1cqpPZJKhF
-UiUstPYl6vFONE5hLGxKI+6Xg6HYkkc/qawCmY3fuNxC5Hv4n0dwQGdcUqMt5oMK
-1NhfPnunBXY2d/N3SaeBh8PW9Wk5zDq/S2LcO6fgdSho3R3oGbkHj52wPLWK93Vr
-IBU1NhswvR69IOT92UG5KAqHK3VFp8EatuvbODQpvd0uuwIf7BO4Cj7ZPy5R7u8c
-6fwyP1C/jTwSER143NA0LlmjR+qowsicz7zhBI4Fv6dj4rO725lnZ0+Sqok/45SR
-jYdSPZnyWhiWh2ImfMC5INIlWvTtpL6dbfbkR1ZVABVkn3j0Xe4kpsFrmhY693mJ
-LY8PTKJpIZeoj/XrnTDm/NgwcDHpS8j3F++DwZ2UxzJSOgmL9NJlC1lf1ehhxQt8
-33+/zTw6VXwK0PUputdS7xf7z+10Yf4el1kEoAzWZwaz5bwVFOyCQHPCYxuSUKz+
-O0X8FWd2wgPCmU6CB518Cv9cOyUfoZZuV3Va/IyoOUvwNd5Lxen0mo2LPNlXRMVM
-e44+PKmbFA==
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/expired/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/expired/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/expired/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/expired/packages b/tests/pkg/1/build2.org/auth/expired/packages
deleted file mode 100644
index 9aaf177..0000000
--- a/tests/pkg/1/build2.org/auth/expired/packages
+++ /dev/null
@@ -1,11 +0,0 @@
-: 1
-sha256sum: ba75221f5f610f5f9ebee19a7449dfcff5c9fb2c7d87d2482b8324c4ea419950
-:
-name: libfoo
-version: 1.0.0
-summary: libfoo
-license: MIT
-url: http://example.org
-email: pkg@example.org
-location: libfoo-1.0.0.tar.gz
-sha256sum: 642aa60cda80f6579247dfc64192c67ec3f2ed932ae2f56e592000ad9fea435d
diff --git a/tests/pkg/1/build2.org/auth/expired/repositories b/tests/pkg/1/build2.org/auth/expired/repositories
deleted file mode 100644
index 8370fa4..0000000
--- a/tests/pkg/1/build2.org/auth/expired/repositories
+++ /dev/null
@@ -1,33 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFLzCCAxegAwIBAgIJAPIoh0763iYdMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoMDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDDA9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNTAxMTA1MDMyWhcNMTYwNTAyMTA1MDMyWjAzMRcwFQYDVQQKDA5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAwwPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaNGMEQwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMBoGA1UdEQQTMBGBD2luZm9AYnVpbGQyLm9yZzANBgkqhkiG9w0BAQsFAAOC
-AgEAAb+Yxvqi4sOZ+Ti8wcxkxqFrIs32M3XgJIeZYJn9JZbtjuBx0JFZWnL/tz4M
-VTiM2nrUc4qIIpTqEt2If1NcdH0Cjvf6vysLvIOoB4q09B+aW4F+19moixYodoDp
-qq1Ki1MZrBMx+KUICagqRSklPyxaZ2rEFv2TY0pg8/QRFRWGCFgdWJleX6VsqIXC
-KDK6MyHfR1gsDnZZfgr7HJCq1SH3loqlchLBvAF6K/c1LdQyJFYoP4xAt6yaQWzv
-wEqqhhZ7tLpjrjK0K2pqsPoupNcNhE31k+6ZdM5Z5oHT844qKIVNJIdlvFwnQ3ed
-grP6gBCLVY7h7GJ0x2ZG/2hYt4My8RqLxFYHaHAzQsmXFATIzT1Yqz1nw+8V3l5P
-m+rXQNVAw7rgpl3T7klbHVfkg5rPa0kF66PkKq5ax46NS6KVj9sNOqkcXL7huQSG
-BnSLTkaLwwrSZWl+DPXeY8TgUGkkEMY6RvYdqoOGZiZSqtMfK9QKsFi79a4Munc8
-ypUPxE++jhtXcarDy0ta3BXrspIg63a2Ab6C5yv2fC31Ec5v75rUxt9BVxMMQdlX
-h9eMe5FmkgkSBcklOShE2kZvTOPUCSq8DK7JuKsKEH3istPto+PpoyT8RxuZ9K2Q
-rr78CskHtj+TVdFv7TAqn2YDx9ki4HJIxWKVanJ+zOBSrJw=
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/expired/signature b/tests/pkg/1/build2.org/auth/expired/signature
deleted file mode 100644
index dc2aeee..0000000
--- a/tests/pkg/1/build2.org/auth/expired/signature
+++ /dev/null
@@ -1,13 +0,0 @@
-: 1
-sha256sum: cd05e2ebe9dac484950a54e95a76efba0cac27ec5148dc34fa23a5cd7da72e3d
-signature: \
-geWdw7Gm+Rt+CLDMBby5Y796E8rxwImb0bmcZwGWar9D3vkFm9Kjh00Buuo1PuU7tP1dV6yvRbH8
-NzC0IryEoUJHx9909AJ449ET9Zb+C3ykEeBlKH2wonj7cAVK9ZEDpPEGAtp56XWZQEawl50mwq6t
-XkZAABxtOswXiicdh3HK7kaPHp38/9CBMc0rva6wDnkbTigUYA2ULqLtP5a5mLovVc48zI9A/hmb
-Qx1/Nr7nzTZNDGK7CwTAb1fPam9rZklTfCTPSPUUjvWjM9XdY8cbRE1FrE14TXdyQPxCLzHO2dUO
-YWH5/qMikEoCYhYXQ6KhekoT/MUiVC3PMcYQbYOrOtSxq6RcgnymexBe1XIyld5Rfo1eXu8TK11r
-QPULIqAGy6RwEUhGznuEiGHQwb1UymNyJ/qgr4vBPjJtlvptqG5XNmtiJ22f07nmeVRi2Vg2UyOw
-HoVpy5t/w0tEnUXPA39Vt0v1bUm7Knhc8qL4JFEqK/j/CzEHzEtAjn0aoGuKubCO0WUa+v6ZlkLU
-YrNUIdgT1wgj4yEhLO3g+NsnxFH05D2sfR16rrkI2E6st5crAHR8FOl2FDsWxgKqNbzXZw7rl+Fa
-TobGycX7MDf2mbBmR/KmEkMBJ4mziWLAycSAGyE5VRYDwHPJlQE0143wBzT8eNw4VLm/r+88VYw=
-\
diff --git a/tests/pkg/1/build2.org/auth/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/libfoo-1.0.0.tar.gz
deleted file mode 100644
index 28a6a90..0000000
--- a/tests/pkg/1/build2.org/auth/libfoo-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/auth/name-mismatch/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/name-mismatch/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/name-mismatch/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/name-mismatch/repositories b/tests/pkg/1/build2.org/auth/name-mismatch/repositories
deleted file mode 100644
index 15fa092..0000000
--- a/tests/pkg/1/build2.org/auth/name-mismatch/repositories
+++ /dev/null
@@ -1,34 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFXTCCA0WgAwIBAgIJANXKeBuJax30MA0GCSqGSIb3DQEBCwUAMEoxFzAVBgNV
-BAoMDkNvZGUgU3ludGhlc2lzMS8wLQYDVQQDDCZuYW1lOmJ1aWxkMi5vcmcvYXV0
-aC9taXNtYXRjaGVkL25hbWUveDAeFw0xNjA1MDMyMzUyNDJaFw0xNzA1MDMyMzUy
-NDJaMEoxFzAVBgNVBAoMDkNvZGUgU3ludGhlc2lzMS8wLQYDVQQDDCZuYW1lOmJ1
-aWxkMi5vcmcvYXV0aC9taXNtYXRjaGVkL25hbWUveDCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBANq78SXuzFzCMoFU1RnzEeAfzE0UUYGynS3F2lG7viH3
-coxjLt+BrFBudVs4XDTpjXS19hRxIohEgD71W1jhDvmUC9yCMW13PCIIjRKTTz0e
-fEhTcMHdhOgvKZsje0IV7svoKVXcG7DfUVl51wWPQPSbUrfsQbsXg7Pz5HaDx+Dt
-2i9hwdE1M0z4R2dtwQkszFyCKiX8RF9oPXirTz5ETLC3f19JUapLrY5l5ZylzQif
-LhPMlHLlrT0n7KkohH7waX3KyeLa0M2IIl3zaeAsuN+ErFVecAdlJIvX00cth2OO
-/Gxy09sIKlagi2q7ZDik2sMvG8dAv7gNZsXp+FOj/XXCiOI9f6D5ospJdK9B5UCA
-BjmGc8W5Odv6ZLey5Ui76luI7ciITOKfAoEkbyMiNHiRxLdM7aAeizdcwHU4bm6J
-lmiJk8UyyV85f33mvCSfuo7D+DQYiK650/xwRdTFBIqi38IwME62gT7ah/AOmiPs
-hj7FjwIU7ZWHskyr9qpExQOEKJXoLZJo1rf6MRc8AsJyz6zdfQhT1BTzhogNfru4
-xjVM6fSrjRUF34msuWcz/HKo9W350Aw2y5F59kziP+m7G6uBYrqmElv/13Vamg2Z
-Z1b38KMz5Ss3SkfcDErOzz/D+0hRlOaCIeWts1G2zWcQvBnn+zGA+sTIu0xAFOCR
-AgMBAAGjRjBEMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcD
-AzAaBgNVHREEEzARgQ9pbmZvQGJ1aWxkMi5vcmcwDQYJKoZIhvcNAQELBQADggIB
-AKvUnaZP20bf4ahpa50QUvRb4Kel7yhvvmae7/aIBk5ANxnJC3yuOpmtGve5+lLE
-+6w/XwFASz/7PAdUlEp+LBYknGnx5StoqBzP7nwapm+tBcrZ3Q5MxareXXOSx1Ac
-4Dh9vDMRevDHZ5LQATHG+Q7zaKmBb0ZeSjJlP4+0680AKN4YDmY1a81uoa1jRXbV
-c4iutSoBaVNdWB5+GGelEjvhzN0gZ22IpS3mjbyCbJNywHQMHBLwtxuFgkdOfPkC
-MGBbvG5TD7SKgQNlfsoQu3UJpokzz7hP1TmjCpSDjGSqJlYvovrHCFQGWjtk0UVQ
-tXAQiVPlMsj2kbxJf2ICYYZuvQbmhvNF049ldrpk26jlDzSZ+5t2jueC+q8knTsn
-p3LPx7sqGfkIq41pxHAQseBSYUEo6r6LwfDQPmwb7fOUpLJm6GdsEkqqUhmB3W6Y
-H4t6PKCjFI91JqTka6oF3Lblf3QLXlMpevBwvgaZAC1d4eiNPq+mSAL6T2Cb8Hvq
-Imzyh6EcMbWD9RSnbDCujBjnj0WXO7VjUqShZ60D78PCdXbaK7RAOX9cLUYO/OHd
-z5vUbBrPvDImu5gJFRLOGKKw/7Yn9um/pyuSHuuucBkjBJ4J/tPi/MBZiWM7g2qc
-obzYoLev74dMkZMZDsGDAcuYX40ZVkF7ATqZC405/fSH
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/sha256sum-mismatch/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/sha256sum-mismatch/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/sha256sum-mismatch/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/sha256sum-mismatch/repositories b/tests/pkg/1/build2.org/auth/sha256sum-mismatch/repositories
deleted file mode 100644
index 9bcb20a..0000000
--- a/tests/pkg/1/build2.org/auth/sha256sum-mismatch/repositories
+++ /dev/null
@@ -1,33 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFLzCCAxegAwIBAgIJAK41T2Si9cMEMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoTDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDEw9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNDMwMTQyNDQ3WhcNMTcwNDMwMTQyNDQ3WjAzMRcwFQYDVQQKEw5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAxMPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaNGMEQwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMBoGA1UdEQQTMBGBD2luZm9AYnVpbGQyLm9yZzANBgkqhkiG9w0BAQsFAAOC
-AgEAeBHkz12OPjjFPftCZ8u/9Kq+W0ZnqQqXmSLj5SQFiG5PEUSV19XFcGawwjbU
-6guceUSHhHQr/KhpV02pyoPPtskdognHQCPr6HCR6eeEtfBUSum5dKpJAWqGhszg
-bPCb11/ksBBzpBbc/C+gnU8ZvsglJ/wxrizZ0AYeSdvyWq8pgoh2vGpgdhK5MWhd
-rVGQm+TUVmXyQwNrYDjqhoGZF02UilIekedegWUEvkXnk5rzyzTaX+GwlnsplVY2
-Xijn8cWkO4cCDkthyjfNPgUm8ZgKuBgs+OYRbW4XtuXgeBucBVCryrM8+3OSmzbs
-IBQWL0EDT7bnt2ukE+cUx8Foc/+180KZAdDbUY9MOsYCac3bXnIJd/q1pzkr+OvL
-EXnuIGuzUqVkcD4+ABaWefNUm3KeZwBAupYc9eo2/YzpCUsgAe0PAdgJhcg9D4kX
-2RwwjVpOPWUxevrPq32Lo3R8obfl2aCLzcuiuheb1EcJLlAH67KqdXLDpvZqJ9qi
-iaBCixRl2t3our5VSBWQQefGnH6DWn1JM34zyBbeZdgjyqebSN42p+hADYe2qzdf
-AviHJsBwvt3HYpr3bfU6EDx1cU5D6gNAxzZMkZhnEQ7u6kXDcLyWJhgXcZhGT0xv
-D/x+fIGI1t2XkoOmvuno1MqoDQX3sCYd0bfB/9wwzcNexic=
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/signature-mismatch/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/signature-mismatch/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/signature-mismatch/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/signature-mismatch/repositories b/tests/pkg/1/build2.org/auth/signature-mismatch/repositories
deleted file mode 100644
index 9bcb20a..0000000
--- a/tests/pkg/1/build2.org/auth/signature-mismatch/repositories
+++ /dev/null
@@ -1,33 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFLzCCAxegAwIBAgIJAK41T2Si9cMEMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoTDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDEw9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNDMwMTQyNDQ3WhcNMTcwNDMwMTQyNDQ3WjAzMRcwFQYDVQQKEw5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAxMPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaNGMEQwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMBoGA1UdEQQTMBGBD2luZm9AYnVpbGQyLm9yZzANBgkqhkiG9w0BAQsFAAOC
-AgEAeBHkz12OPjjFPftCZ8u/9Kq+W0ZnqQqXmSLj5SQFiG5PEUSV19XFcGawwjbU
-6guceUSHhHQr/KhpV02pyoPPtskdognHQCPr6HCR6eeEtfBUSum5dKpJAWqGhszg
-bPCb11/ksBBzpBbc/C+gnU8ZvsglJ/wxrizZ0AYeSdvyWq8pgoh2vGpgdhK5MWhd
-rVGQm+TUVmXyQwNrYDjqhoGZF02UilIekedegWUEvkXnk5rzyzTaX+GwlnsplVY2
-Xijn8cWkO4cCDkthyjfNPgUm8ZgKuBgs+OYRbW4XtuXgeBucBVCryrM8+3OSmzbs
-IBQWL0EDT7bnt2ukE+cUx8Foc/+180KZAdDbUY9MOsYCac3bXnIJd/q1pzkr+OvL
-EXnuIGuzUqVkcD4+ABaWefNUm3KeZwBAupYc9eo2/YzpCUsgAe0PAdgJhcg9D4kX
-2RwwjVpOPWUxevrPq32Lo3R8obfl2aCLzcuiuheb1EcJLlAH67KqdXLDpvZqJ9qi
-iaBCixRl2t3our5VSBWQQefGnH6DWn1JM34zyBbeZdgjyqebSN42p+hADYe2qzdf
-AviHJsBwvt3HYpr3bfU6EDx1cU5D6gNAxzZMkZhnEQ7u6kXDcLyWJhgXcZhGT0xv
-D/x+fIGI1t2XkoOmvuno1MqoDQX3sCYd0bfB/9wwzcNexic=
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/signed/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/signed/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/signed/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/signed/repositories b/tests/pkg/1/build2.org/auth/signed/repositories
deleted file mode 100644
index 9bcb20a..0000000
--- a/tests/pkg/1/build2.org/auth/signed/repositories
+++ /dev/null
@@ -1,33 +0,0 @@
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFLzCCAxegAwIBAgIJAK41T2Si9cMEMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoTDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDEw9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNDMwMTQyNDQ3WhcNMTcwNDMwMTQyNDQ3WjAzMRcwFQYDVQQKEw5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAxMPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaNGMEQwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMBoGA1UdEQQTMBGBD2luZm9AYnVpbGQyLm9yZzANBgkqhkiG9w0BAQsFAAOC
-AgEAeBHkz12OPjjFPftCZ8u/9Kq+W0ZnqQqXmSLj5SQFiG5PEUSV19XFcGawwjbU
-6guceUSHhHQr/KhpV02pyoPPtskdognHQCPr6HCR6eeEtfBUSum5dKpJAWqGhszg
-bPCb11/ksBBzpBbc/C+gnU8ZvsglJ/wxrizZ0AYeSdvyWq8pgoh2vGpgdhK5MWhd
-rVGQm+TUVmXyQwNrYDjqhoGZF02UilIekedegWUEvkXnk5rzyzTaX+GwlnsplVY2
-Xijn8cWkO4cCDkthyjfNPgUm8ZgKuBgs+OYRbW4XtuXgeBucBVCryrM8+3OSmzbs
-IBQWL0EDT7bnt2ukE+cUx8Foc/+180KZAdDbUY9MOsYCac3bXnIJd/q1pzkr+OvL
-EXnuIGuzUqVkcD4+ABaWefNUm3KeZwBAupYc9eo2/YzpCUsgAe0PAdgJhcg9D4kX
-2RwwjVpOPWUxevrPq32Lo3R8obfl2aCLzcuiuheb1EcJLlAH67KqdXLDpvZqJ9qi
-iaBCixRl2t3our5VSBWQQefGnH6DWn1JM34zyBbeZdgjyqebSN42p+hADYe2qzdf
-AviHJsBwvt3HYpr3bfU6EDx1cU5D6gNAxzZMkZhnEQ7u6kXDcLyWJhgXcZhGT0xv
-D/x+fIGI1t2XkoOmvuno1MqoDQX3sCYd0bfB/9wwzcNexic=
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/auth/unsigned1/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/unsigned1/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/unsigned1/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/unsigned1/repositories b/tests/pkg/1/build2.org/auth/unsigned1/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/auth/unsigned1/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/auth/unsigned2/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/auth/unsigned2/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/auth/unsigned2/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/auth/unsigned2/repositories b/tests/pkg/1/build2.org/auth/unsigned2/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/auth/unsigned2/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/common/bar/stable/libbar-1.0.0.tar.gz b/tests/pkg/1/build2.org/common/bar/stable/libbar-1.0.0.tar.gz
deleted file mode 100644
index d77c1ba..0000000
--- a/tests/pkg/1/build2.org/common/bar/stable/libbar-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/bar/stable/repositories b/tests/pkg/1/build2.org/common/bar/stable/repositories
deleted file mode 100644
index b8ecc1f..0000000
--- a/tests/pkg/1/build2.org/common/bar/stable/repositories
+++ /dev/null
@@ -1,6 +0,0 @@
-# bar/stable
-#
-: 1
-location: ../../foo/stable
-:
-
diff --git a/tests/pkg/1/build2.org/common/bar/testing/libbar-1.1.0.tar.gz b/tests/pkg/1/build2.org/common/bar/testing/libbar-1.1.0.tar.gz
deleted file mode 100644
index f081804..0000000
--- a/tests/pkg/1/build2.org/common/bar/testing/libbar-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/bar/testing/repositories b/tests/pkg/1/build2.org/common/bar/testing/repositories
deleted file mode 100644
index 5ab8cba..0000000
--- a/tests/pkg/1/build2.org/common/bar/testing/repositories
+++ /dev/null
@@ -1,8 +0,0 @@
-# bar/testing
-#
-: 1
-location: ../../foo/testing
-:
-location: ../stable
-role: complement
-:
diff --git a/tests/pkg/1/build2.org/common/bar/unstable/libbar-1.1.1.tar.gz b/tests/pkg/1/build2.org/common/bar/unstable/libbar-1.1.1.tar.gz
deleted file mode 100644
index a0fbdc3..0000000
--- a/tests/pkg/1/build2.org/common/bar/unstable/libbar-1.1.1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/bar/unstable/repositories b/tests/pkg/1/build2.org/common/bar/unstable/repositories
deleted file mode 100644
index d4ddcf5..0000000
--- a/tests/pkg/1/build2.org/common/bar/unstable/repositories
+++ /dev/null
@@ -1,8 +0,0 @@
-# bar/unstable
-#
-: 1
-location: ../../foo/testing
-:
-location: ../testing
-role: complement
-:
diff --git a/tests/pkg/1/build2.org/common/foo/stable/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/common/foo/stable/libfoo-1.0.0.tar.gz
deleted file mode 100644
index c29dd9d..0000000
--- a/tests/pkg/1/build2.org/common/foo/stable/libfoo-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/foo/stable/repositories b/tests/pkg/1/build2.org/common/foo/stable/repositories
deleted file mode 100644
index 13673fb..0000000
--- a/tests/pkg/1/build2.org/common/foo/stable/repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-# foo/stable
-#
-: 1
diff --git a/tests/pkg/1/build2.org/common/foo/testing/libfoo-1.1.0.tar.gz b/tests/pkg/1/build2.org/common/foo/testing/libfoo-1.1.0.tar.gz
deleted file mode 100644
index a6c0202..0000000
--- a/tests/pkg/1/build2.org/common/foo/testing/libfoo-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/foo/testing/repositories b/tests/pkg/1/build2.org/common/foo/testing/repositories
deleted file mode 100644
index cd33f88..0000000
--- a/tests/pkg/1/build2.org/common/foo/testing/repositories
+++ /dev/null
@@ -1,6 +0,0 @@
-# foo/testing
-#
-: 1
-location: ../stable
-role: complement
-:
diff --git a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz
deleted file mode 100644
index e9d9ff1..0000000
--- a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/common/hello/repositories b/tests/pkg/1/build2.org/common/hello/repositories
deleted file mode 100644
index bbe8a66..0000000
--- a/tests/pkg/1/build2.org/common/hello/repositories
+++ /dev/null
@@ -1,36 +0,0 @@
-# Hello World repository. Currently does not have any prerequisite
-# repositories.
-#
-: 1
-certificate: \
------BEGIN CERTIFICATE-----
-MIIFLzCCAxegAwIBAgIJAK41T2Si9cMEMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV
-BAoTDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDEw9uYW1lOmJ1aWxkMi5vcmcwHhcN
-MTYwNDMwMTQyNDQ3WhcNMTcwNDMwMTQyNDQ3WjAzMRcwFQYDVQQKEw5Db2RlIFN5
-bnRoZXNpczEYMBYGA1UEAxMPbmFtZTpidWlsZDIub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2rvxJe7MXMIygVTVGfMR4B/MTRRRgbKdLcXaUbu+
-IfdyjGMu34GsUG51WzhcNOmNdLX2FHEiiESAPvVbWOEO+ZQL3IIxbXc8IgiNEpNP
-PR58SFNwwd2E6C8pmyN7QhXuy+gpVdwbsN9RWXnXBY9A9JtSt+xBuxeDs/PkdoPH
-4O3aL2HB0TUzTPhHZ23BCSzMXIIqJfxEX2g9eKtPPkRMsLd/X0lRqkutjmXlnKXN
-CJ8uE8yUcuWtPSfsqSiEfvBpfcrJ4trQzYgiXfNp4Cy434SsVV5wB2Uki9fTRy2H
-Y478bHLT2wgqVqCLartkOKTawy8bx0C/uA1mxen4U6P9dcKI4j1/oPmiykl0r0Hl
-QIAGOYZzxbk52/pkt7LlSLvqW4jtyIhM4p8CgSRvIyI0eJHEt0ztoB6LN1zAdThu
-bomWaImTxTLJXzl/fea8JJ+6jsP4NBiIrrnT/HBF1MUEiqLfwjAwTraBPtqH8A6a
-I+yGPsWPAhTtlYeyTKv2qkTFA4QolegtkmjWt/oxFzwCwnLPrN19CFPUFPOGiA1+
-u7jGNUzp9KuNFQXfiay5ZzP8cqj1bfnQDDbLkXn2TOI/6bsbq4FiuqYSW//XdVqa
-DZlnVvfwozPlKzdKR9wMSs7PP8P7SFGU5oIh5a2zUbbNZxC8Gef7MYD6xMi7TEAU
-4JECAwEAAaNGMEQwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUF
-BwMDMBoGA1UdEQQTMBGBD2luZm9AYnVpbGQyLm9yZzANBgkqhkiG9w0BAQsFAAOC
-AgEAeBHkz12OPjjFPftCZ8u/9Kq+W0ZnqQqXmSLj5SQFiG5PEUSV19XFcGawwjbU
-6guceUSHhHQr/KhpV02pyoPPtskdognHQCPr6HCR6eeEtfBUSum5dKpJAWqGhszg
-bPCb11/ksBBzpBbc/C+gnU8ZvsglJ/wxrizZ0AYeSdvyWq8pgoh2vGpgdhK5MWhd
-rVGQm+TUVmXyQwNrYDjqhoGZF02UilIekedegWUEvkXnk5rzyzTaX+GwlnsplVY2
-Xijn8cWkO4cCDkthyjfNPgUm8ZgKuBgs+OYRbW4XtuXgeBucBVCryrM8+3OSmzbs
-IBQWL0EDT7bnt2ukE+cUx8Foc/+180KZAdDbUY9MOsYCac3bXnIJd/q1pzkr+OvL
-EXnuIGuzUqVkcD4+ABaWefNUm3KeZwBAupYc9eo2/YzpCUsgAe0PAdgJhcg9D4kX
-2RwwjVpOPWUxevrPq32Lo3R8obfl2aCLzcuiuheb1EcJLlAH67KqdXLDpvZqJ9qi
-iaBCixRl2t3our5VSBWQQefGnH6DWn1JM34zyBbeZdgjyqebSN42p+hADYe2qzdf
-AviHJsBwvt3HYpr3bfU6EDx1cU5D6gNAxzZMkZhnEQ7u6kXDcLyWJhgXcZhGT0xv
-D/x+fIGI1t2XkoOmvuno1MqoDQX3sCYd0bfB/9wwzcNexic=
------END CERTIFICATE-----
-\
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL b/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL
deleted file mode 100644
index 485b10f..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Just use build2, bro.
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build
deleted file mode 100644
index 8d8db2b..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build
+++ /dev/null
@@ -1,22 +0,0 @@
-project = libhello
-
-using build@0.4.0-a1
-
-version = 1.0.0
-
-abi_major = 1
-abi_minor = 0
-abi_patch = 0
-abi_prerelease = false
-
-revision = 0
-
-dist.package = $project-$version
-
-if ($revision != 0)
-  dist.package += +$revision
-
-using config
-using dist
-using test
-using install
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build
deleted file mode 100644
index 1eb73b7..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build
+++ /dev/null
@@ -1,6 +0,0 @@
-$out_root/:
-{
-  include hello/
-}
-
-export $out_root/hello/lib{hello}
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build
deleted file mode 100644
index 4f70114..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build
+++ /dev/null
@@ -1,6 +0,0 @@
-cxx.std = 11
-
-using cxx
-
-hxx{*}: extension =
-cxx{*}: extension = cxx
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile
deleted file mode 100644
index a416648..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile
+++ /dev/null
@@ -1,8 +0,0 @@
-d = hello/ tests/
-./: $d doc{INSTALL version} file{manifest}
-include $d
-
-# Don't install tests or the INSTALL file.
-#
-dir{tests/}: install = false
-doc{INSTALL}@./: install = false
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile
deleted file mode 100644
index bff7fce..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile
+++ /dev/null
@@ -1,21 +0,0 @@
-lib{hello}: {hxx cxx}{hello} hxx{export}
-
-# For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version.
-#
-if $abi_prerelease
-  lib{hello}: bin.lib.version = @-$version
-else
-  lib{hello}: bin.lib.version = @-$abi_major.$abi_minor
-
-cxx.poptions += "-I$src_root"
-obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
-
-lib{hello}: cxx.export.poptions = "-I$src_root"
-liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
-libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
-
-# Install into the hello/ subdirectory of, say, /usr/include/.
-#
-install.include = $install.include/hello/
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export
deleted file mode 100644
index 18f4968..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export
+++ /dev/null
@@ -1,36 +0,0 @@
-// file: hello/export -*- C++ -*-
-
-#pragma once
-
-// Normally we don't export class templates (but do complete specializations),
-// inline functions, and classes with only inline member functions. Exporting
-// classes that inherit from non-exported/imported bases (e.g., std::string)
-// will end up badly. The only known workarounds are to not inherit or to not
-// export. Also, MinGW GCC doesn't like seeing non-exported function being
-// used before their inline definition. The workaround is to reorder code. In
-// the end it's all trial and error.
-
-#if defined(LIBHELLO_STATIC)         // Using static.
-#  define LIBHELLO_EXPORT
-#elif defined(LIBHELLO_STATIC_BUILD) // Building static.
-#  define LIBHELLO_EXPORT
-#elif defined(LIBHELLO_SHARED)       // Using shared.
-#  ifdef _WIN32
-#    define LIBHELLO_EXPORT __declspec(dllimport)
-#  else
-#    define LIBHELLO_EXPORT
-#  endif
-#elif defined(LIBHELLO_SHARED_BUILD) // Building shared.
-#  ifdef _WIN32
-#    define LIBHELLO_EXPORT __declspec(dllexport)
-#  else
-#    define LIBHELLO_EXPORT
-#  endif
-#else
-// If none of the above macros are defined, then we assume we are being used
-// by some third-party build system that cannot/doesn't signal the library
-// type. Note that this fallback works for both static and shared but in case
-// of shared will be sub-optimal compared to having dllimport.
-//
-#  define LIBHELLO_EXPORT            // Using static or shared.
-#endif
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello
deleted file mode 100644
index 5fb7d9e..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello
+++ /dev/null
@@ -1,13 +0,0 @@
-// file: hello/hello -*- C++ -*-
-
-#pragma once
-
-#include <string>
-
-#include <hello/export>
-
-namespace hello
-{
-  LIBHELLO_EXPORT void
-  say (const std::string& name);
-}
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx
deleted file mode 100644
index 65d0aa7..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-// file: hello/hello.cxx -*- C++ -*-
-
-#include <hello/hello>
-
-#include <iostream>
-
-using namespace std;
-
-namespace hello
-{
-  void
-  say (const string& n)
-  {
-    cout << "Hello, " << n << '!' << endl;
-  }
-}
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest b/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest
deleted file mode 100644
index 75dc91b..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-: 1
-name: libhello
-version: 1.0.0
-summary: The "Hello World" example library
-license: MIT
-tags: c++, hello, world, example
-description: \
-A simple library that implements the "Hello World" example in C++. Its primary
-goal is to show a canonical build2/bpkg project/package.
-\
-url: http://www.example.org/libhello
-email: hello-users@example.org
-requires: c++11
-requires: build2 >= 0.4.0
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build
deleted file mode 100644
index 2c2de24..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build
+++ /dev/null
@@ -1,5 +0,0 @@
-project = # Unnamed subproject.
-
-using config
-using dist
-using test
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build
deleted file mode 100644
index de723b8..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build
+++ /dev/null
@@ -1,14 +0,0 @@
-cxx.std = 11
-
-using cxx
-
-hxx{*}: extension =
-cxx{*}: extension = cxx
-
-# Every exe{} in this subproject is by default a test.
-#
-exe{*}: test = true
-
-# Specify the test target for cross-testing.
-#
-test.target = $cxx.target
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile
deleted file mode 100644
index 4dcbe2a..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile
+++ /dev/null
@@ -1,3 +0,0 @@
-d = test/
-./: $d
-include $d
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile
deleted file mode 100644
index a46969d..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile
+++ /dev/null
@@ -1,4 +0,0 @@
-import libs = libhello%lib{hello}
-
-exe{driver}: cxx{driver} $libs
-exe{driver}: test.output = test.out
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx
deleted file mode 100644
index 59bfb2d..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-// file: tests/test/driver.cxx -*- C++ -*-
-
-#include <hello/hello>
-
-int
-main ()
-{
-  using hello::say;
-
-  say ("World");
-}
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out
deleted file mode 100644
index 8ab686e..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out
+++ /dev/null
@@ -1 +0,0 @@
-Hello, World!
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/version b/tests/pkg/1/build2.org/common/libhello-1.0.0/version
deleted file mode 100644
index 3eefcb9..0000000
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.0
diff --git a/tests/pkg/1/build2.org/common/not-a-package.tar.gz b/tests/pkg/1/build2.org/common/not-a-package.tar.gz
deleted file mode 100644
index aa10905..0000000
--- a/tests/pkg/1/build2.org/common/not-a-package.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libbar-1.0.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libbar-1.0.0.tar.gz
deleted file mode 100644
index 0ae6e26..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libbar-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libbar-1.1.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libbar-1.1.0.tar.gz
deleted file mode 100644
index 39dbdf4..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libbar-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libbar-1.2.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libbar-1.2.0.tar.gz
deleted file mode 100644
index 3a034ff..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libbar-1.2.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libbar-1.3.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libbar-1.3.0.tar.gz
deleted file mode 100644
index 19d5a6f..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libbar-1.3.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libfoo-1.0.0.tar.gz
deleted file mode 100644
index 28a6a90..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libfoo-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libfoo-1.1.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libfoo-1.1.0.tar.gz
deleted file mode 100644
index e03481f..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libfoo-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/libfoo-1.2.0.tar.gz b/tests/pkg/1/build2.org/depend/stable/libfoo-1.2.0.tar.gz
deleted file mode 100644
index aad6906..0000000
--- a/tests/pkg/1/build2.org/depend/stable/libfoo-1.2.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/depend/stable/repositories b/tests/pkg/1/build2.org/depend/stable/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/depend/stable/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/fetch/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/fetch/libfoo-1.0.0.tar.gz
deleted file mode 100644
index 28a6a90..0000000
--- a/tests/pkg/1/build2.org/fetch/libfoo-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0.tar.gz b/tests/pkg/1/build2.org/fetch/libfoo-1.1.0.tar.gz
deleted file mode 100644
index e03481f..0000000
--- a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/build/bootstrap.build b/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/build/bootstrap.build
deleted file mode 100644
index 54f267e..0000000
--- a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/build/bootstrap.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project = fetch-libfoo
-using config
diff --git a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/buildfile b/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/buildfile
deleted file mode 100644
index 9f80de9..0000000
--- a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/buildfile
+++ /dev/null
@@ -1 +0,0 @@
-./:
diff --git a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/manifest b/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/manifest
deleted file mode 100644
index 3453757..0000000
--- a/tests/pkg/1/build2.org/fetch/libfoo-1.1.0/manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-: 1
-name: libfoo
-version: 1.1.0
-summary: libfoo
-license: MIT
-url: http://example.org
-email: pkg@example.org
diff --git a/tests/pkg/1/build2.org/fetch/repositories b/tests/pkg/1/build2.org/fetch/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/fetch/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/fetch/t1/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/fetch/t1/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/fetch/t1/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/fetch/t1/libfoo-1.1.0.tar.gz b/tests/pkg/1/build2.org/fetch/t1/libfoo-1.1.0.tar.gz
deleted file mode 120000
index c004b2a..0000000
--- a/tests/pkg/1/build2.org/fetch/t1/libfoo-1.1.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.1.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/fetch/t1/repositories b/tests/pkg/1/build2.org/fetch/t1/repositories
deleted file mode 120000
index d965b15..0000000
--- a/tests/pkg/1/build2.org/fetch/t1/repositories
+++ /dev/null
@@ -1 +0,0 @@
-../repositories
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/libbar-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libbar-1.0.0.tar.gz
deleted file mode 100644
index 5dc3a9b..0000000
--- a/tests/pkg/1/build2.org/satisfy/libbar-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libbar-1.1.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libbar-1.1.0.tar.gz
deleted file mode 100644
index 881292e..0000000
--- a/tests/pkg/1/build2.org/satisfy/libbar-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libbar-1.2.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libbar-1.2.0.tar.gz
deleted file mode 100644
index 4572395..0000000
--- a/tests/pkg/1/build2.org/satisfy/libbar-1.2.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libbaz-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libbaz-1.0.0.tar.gz
deleted file mode 100644
index 1de32b2..0000000
--- a/tests/pkg/1/build2.org/satisfy/libbaz-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libbaz-1.1.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libbaz-1.1.0.tar.gz
deleted file mode 100644
index 1aa72a8..0000000
--- a/tests/pkg/1/build2.org/satisfy/libbaz-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libbiz-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libbiz-1.0.0.tar.gz
deleted file mode 100644
index 42e3db4..0000000
--- a/tests/pkg/1/build2.org/satisfy/libbiz-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-0.0.1.tar.gz b/tests/pkg/1/build2.org/satisfy/libfoo-0.0.1.tar.gz
deleted file mode 100644
index 2ab5094..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-0.0.1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libfoo-1.0.0.tar.gz
deleted file mode 100644
index 28a6a90..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0.tar.gz
deleted file mode 100644
index e03481f..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/build/bootstrap.build b/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/build/bootstrap.build
deleted file mode 100644
index b24ee6a..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/build/bootstrap.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project = satisfy-libfoo
-using config
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/buildfile b/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/buildfile
deleted file mode 100644
index 9f80de9..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/buildfile
+++ /dev/null
@@ -1 +0,0 @@
-./:
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/manifest b/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/manifest
deleted file mode 100644
index 3453757..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-1.1.0/manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-: 1
-name: libfoo
-version: 1.1.0
-summary: libfoo
-license: MIT
-url: http://example.org
-email: pkg@example.org
diff --git a/tests/pkg/1/build2.org/satisfy/libfoo-1.2.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libfoo-1.2.0.tar.gz
deleted file mode 100644
index 80ce03b..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfoo-1.2.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/libfox-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/libfox-1.0.0.tar.gz
deleted file mode 100644
index 9ba7a31..0000000
--- a/tests/pkg/1/build2.org/satisfy/libfox-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/satisfy/repositories b/tests/pkg/1/build2.org/satisfy/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/satisfy/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/satisfy/t1/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t1/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/satisfy/t1/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t1/repositories b/tests/pkg/1/build2.org/satisfy/t1/repositories
deleted file mode 120000
index d965b15..0000000
--- a/tests/pkg/1/build2.org/satisfy/t1/repositories
+++ /dev/null
@@ -1 +0,0 @@
-../repositories
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t2/libbar-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t2/libbar-1.0.0.tar.gz
deleted file mode 120000
index 93e8c71..0000000
--- a/tests/pkg/1/build2.org/satisfy/t2/libbar-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbar-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t2/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t2/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/satisfy/t2/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t2/repositories b/tests/pkg/1/build2.org/satisfy/t2/repositories
deleted file mode 120000
index d965b15..0000000
--- a/tests/pkg/1/build2.org/satisfy/t2/repositories
+++ /dev/null
@@ -1 +0,0 @@
-../repositories
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t3/libbaz-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t3/libbaz-1.0.0.tar.gz
deleted file mode 120000
index 189242a..0000000
--- a/tests/pkg/1/build2.org/satisfy/t3/libbaz-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbaz-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t3/libfox-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t3/libfox-1.0.0.tar.gz
deleted file mode 120000
index dcfd7aa..0000000
--- a/tests/pkg/1/build2.org/satisfy/t3/libfox-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfox-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t3/repositories b/tests/pkg/1/build2.org/satisfy/t3/repositories
deleted file mode 100644
index d65b272..0000000
--- a/tests/pkg/1/build2.org/satisfy/t3/repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-: 1
-location: ../t2
-:
-
diff --git a/tests/pkg/1/build2.org/satisfy/t4a/libfoo-1.1.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t4a/libfoo-1.1.0.tar.gz
deleted file mode 120000
index c004b2a..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4a/libfoo-1.1.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.1.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4a/repositories b/tests/pkg/1/build2.org/satisfy/t4a/repositories
deleted file mode 120000
index d965b15..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4a/repositories
+++ /dev/null
@@ -1 +0,0 @@
-../repositories
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4b/libbar-1.1.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t4b/libbar-1.1.0.tar.gz
deleted file mode 120000
index b9a2de5..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4b/libbar-1.1.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbar-1.1.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4b/repositories b/tests/pkg/1/build2.org/satisfy/t4b/repositories
deleted file mode 100644
index 7b85e71..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4b/repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-: 1
-location: ../t4a
-:
diff --git a/tests/pkg/1/build2.org/satisfy/t4c/libbaz-1.1.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t4c/libbaz-1.1.0.tar.gz
deleted file mode 120000
index 0edbce7..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4c/libbaz-1.1.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbaz-1.1.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4c/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t4c/libfoo-1.0.0.tar.gz
deleted file mode 120000
index 32e5a3c..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4c/libfoo-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfoo-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4c/repositories b/tests/pkg/1/build2.org/satisfy/t4c/repositories
deleted file mode 100644
index 26c0e93..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4c/repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-: 1
-location: ../t4b
-:
diff --git a/tests/pkg/1/build2.org/satisfy/t4d/libbiz-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t4d/libbiz-1.0.0.tar.gz
deleted file mode 120000
index 70c2fda..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4d/libbiz-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbiz-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4d/libfox-1.0.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t4d/libfox-1.0.0.tar.gz
deleted file mode 120000
index dcfd7aa..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4d/libfox-1.0.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libfox-1.0.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t4d/repositories b/tests/pkg/1/build2.org/satisfy/t4d/repositories
deleted file mode 100644
index f0e1983..0000000
--- a/tests/pkg/1/build2.org/satisfy/t4d/repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-: 1
-location: ../t4c
-:
diff --git a/tests/pkg/1/build2.org/satisfy/t5/libbar-1.2.0.tar.gz b/tests/pkg/1/build2.org/satisfy/t5/libbar-1.2.0.tar.gz
deleted file mode 120000
index b4a7773..0000000
--- a/tests/pkg/1/build2.org/satisfy/t5/libbar-1.2.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbar-1.2.0.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/satisfy/t5/repositories b/tests/pkg/1/build2.org/satisfy/t5/repositories
deleted file mode 120000
index d965b15..0000000
--- a/tests/pkg/1/build2.org/satisfy/t5/repositories
+++ /dev/null
@@ -1 +0,0 @@
-../repositories
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/status/extra/libbar-1.1.0+1.tar.gz b/tests/pkg/1/build2.org/status/extra/libbar-1.1.0+1.tar.gz
deleted file mode 100644
index 890e9e2..0000000
--- a/tests/pkg/1/build2.org/status/extra/libbar-1.1.0+1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/status/extra/repositories b/tests/pkg/1/build2.org/status/extra/repositories
deleted file mode 100644
index ecaa454..0000000
--- a/tests/pkg/1/build2.org/status/extra/repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-: 1
-location: ../stable
-:
diff --git a/tests/pkg/1/build2.org/status/stable/libbar-1.0.0.tar.gz b/tests/pkg/1/build2.org/status/stable/libbar-1.0.0.tar.gz
deleted file mode 100644
index 97e6e32..0000000
--- a/tests/pkg/1/build2.org/status/stable/libbar-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/status/stable/libfoo-1.0.0.tar.gz b/tests/pkg/1/build2.org/status/stable/libfoo-1.0.0.tar.gz
deleted file mode 100644
index 5e7fa17..0000000
--- a/tests/pkg/1/build2.org/status/stable/libfoo-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/status/stable/repositories b/tests/pkg/1/build2.org/status/stable/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/status/stable/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/status/testing/libbar-1.0.0+1.tar.gz b/tests/pkg/1/build2.org/status/testing/libbar-1.0.0+1.tar.gz
deleted file mode 100644
index 5794085..0000000
--- a/tests/pkg/1/build2.org/status/testing/libbar-1.0.0+1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/status/testing/libbar-1.1.0.tar.gz b/tests/pkg/1/build2.org/status/testing/libbar-1.1.0.tar.gz
deleted file mode 100644
index b01ac44..0000000
--- a/tests/pkg/1/build2.org/status/testing/libbar-1.1.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/status/testing/repositories b/tests/pkg/1/build2.org/status/testing/repositories
deleted file mode 100644
index 7bd7269..0000000
--- a/tests/pkg/1/build2.org/status/testing/repositories
+++ /dev/null
@@ -1,6 +0,0 @@
-: 1
-location: ../stable
-role: complement
-:
-location: ../extra
-:
diff --git a/tests/pkg/1/build2.org/status/unstable/libbar-2.0.0.tar.gz b/tests/pkg/1/build2.org/status/unstable/libbar-2.0.0.tar.gz
deleted file mode 100644
index 6cc5890..0000000
--- a/tests/pkg/1/build2.org/status/unstable/libbar-2.0.0.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/status/unstable/repositories b/tests/pkg/1/build2.org/status/unstable/repositories
deleted file mode 100644
index 8f4a5f6..0000000
--- a/tests/pkg/1/build2.org/status/unstable/repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-: 1
-location: ../testing
-role: complement
-:
diff --git a/tests/pkg/1/build2.org/system/foo-2.tar.gz b/tests/pkg/1/build2.org/system/foo-2.tar.gz
deleted file mode 100644
index 7fef159..0000000
--- a/tests/pkg/1/build2.org/system/foo-2.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/system/libbar-0+1.tar.gz b/tests/pkg/1/build2.org/system/libbar-0+1.tar.gz
deleted file mode 100644
index 9f90936..0000000
--- a/tests/pkg/1/build2.org/system/libbar-0+1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/system/libbar-1.tar.gz b/tests/pkg/1/build2.org/system/libbar-1.tar.gz
deleted file mode 100644
index 4b52278..0000000
--- a/tests/pkg/1/build2.org/system/libbar-1.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/system/libbar-2.tar.gz b/tests/pkg/1/build2.org/system/libbar-2.tar.gz
deleted file mode 100644
index 28ad509..0000000
--- a/tests/pkg/1/build2.org/system/libbar-2.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/system/libbaz-2.tar.gz b/tests/pkg/1/build2.org/system/libbaz-2.tar.gz
deleted file mode 100644
index 3e9c3e6..0000000
--- a/tests/pkg/1/build2.org/system/libbaz-2.tar.gz
+++ /dev/null
diff --git a/tests/pkg/1/build2.org/system/t1/foo-2.tar.gz b/tests/pkg/1/build2.org/system/t1/foo-2.tar.gz
deleted file mode 120000
index 39d2e10..0000000
--- a/tests/pkg/1/build2.org/system/t1/foo-2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../foo-2.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t1/libbar-1.tar.gz b/tests/pkg/1/build2.org/system/t1/libbar-1.tar.gz
deleted file mode 120000
index 971bed1..0000000
--- a/tests/pkg/1/build2.org/system/t1/libbar-1.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbar-1.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t1/libbar-2.tar.gz b/tests/pkg/1/build2.org/system/t1/libbar-2.tar.gz
deleted file mode 120000
index 2c8027b..0000000
--- a/tests/pkg/1/build2.org/system/t1/libbar-2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbar-2.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t1/libbaz-2.tar.gz b/tests/pkg/1/build2.org/system/t1/libbaz-2.tar.gz
deleted file mode 120000
index 111a2e7..0000000
--- a/tests/pkg/1/build2.org/system/t1/libbaz-2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbaz-2.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t1/repositories b/tests/pkg/1/build2.org/system/t1/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/system/t1/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/system/t2/foo-2.tar.gz b/tests/pkg/1/build2.org/system/t2/foo-2.tar.gz
deleted file mode 120000
index 39d2e10..0000000
--- a/tests/pkg/1/build2.org/system/t2/foo-2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../foo-2.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t2/libbar-0+1.tar.gz b/tests/pkg/1/build2.org/system/t2/libbar-0+1.tar.gz
deleted file mode 120000
index 82bdcba..0000000
--- a/tests/pkg/1/build2.org/system/t2/libbar-0+1.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../libbar-0+1.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t2/repositories b/tests/pkg/1/build2.org/system/t2/repositories
deleted file mode 100644
index 5b70556..0000000
--- a/tests/pkg/1/build2.org/system/t2/repositories
+++ /dev/null
@@ -1 +0,0 @@
-: 1
diff --git a/tests/pkg/1/build2.org/system/t3/foo-2.tar.gz b/tests/pkg/1/build2.org/system/t3/foo-2.tar.gz
deleted file mode 120000
index 39d2e10..0000000
--- a/tests/pkg/1/build2.org/system/t3/foo-2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../foo-2.tar.gz
\ No newline at end of file
diff --git a/tests/pkg/1/build2.org/system/t3/repositories b/tests/pkg/1/build2.org/system/t3/repositories
deleted file mode 100644
index 2715634..0000000
--- a/tests/pkg/1/build2.org/system/t3/repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-: 1
-location: ../t2
-:
\ No newline at end of file
diff --git a/tests/pkg/publish b/tests/pkg/publish
deleted file mode 100755
index 00453cc..0000000
--- a/tests/pkg/publish
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Some commonly useful addtional options that can be specified via the
-# command line:
-#
-# --dry-run
-# --progress
-#
-rsync -v -rlpt --copy-unsafe-links \
---prune-empty-dirs --delete-after --delete-excluded $* \
---include '*/'            \
---include '*.tar.gz'      \
---include 'packages'      \
---include 'repositories'  \
---include 'signature'     \
---exclude '*'             \
-1/build2.org/ build2.org:/var/pkg/1/