From 433920bc9d7533e6de3333e7d5c7205a063da63a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 3 May 2018 14:53:03 +0300 Subject: Adapt to optional base repository manifest --- tests/load/1/math/packages.manifest | 2 +- tests/load/1/math/repositories.manifest | 1 + tests/load/1/misc/packages.manifest | 2 +- tests/load/1/misc/repositories.manifest | 1 + tests/load/1/stable/packages.manifest | 2 +- tests/load/1/stable/repositories.manifest | 2 ++ tests/load/1/stable/signature.manifest | 20 ++++++++++---------- tests/load/cert | 3 +-- 8 files changed, 18 insertions(+), 15 deletions(-) (limited to 'tests/load') diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest index b538d9e..4980e93 100644 --- a/tests/load/1/math/packages.manifest +++ b/tests/load/1/math/packages.manifest @@ -1,5 +1,5 @@ : 1 -sha256sum: 05f690c39da531ea450e8b1f1a2a1314d891c6c5e4e8be5be9c8c2f2ede5e28a +sha256sum: b85ba3a0ba45b98e1fbb2507f199bc4b218a4a413ec6ba4094e214a7507490a2 : name: libexp version: 1~1.2+1 diff --git a/tests/load/1/math/repositories.manifest b/tests/load/1/math/repositories.manifest index 6c63820..c0293c4 100644 --- a/tests/load/1/math/repositories.manifest +++ b/tests/load/1/math/repositories.manifest @@ -2,6 +2,7 @@ # Foreign repository manifest. # location: ../misc +role: prerequisite : # Local repository manifest (this repository). # diff --git a/tests/load/1/misc/packages.manifest b/tests/load/1/misc/packages.manifest index f4f7f59..bf6efca 100644 --- a/tests/load/1/misc/packages.manifest +++ b/tests/load/1/misc/packages.manifest @@ -1,5 +1,5 @@ : 1 -sha256sum: 2f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 +sha256sum: cb315b914aab5cb2104d7806f5f43f4c19a4c1b9fb6f381068886982b159d1a6 : name: libbar version: 2.4.0+3 diff --git a/tests/load/1/misc/repositories.manifest b/tests/load/1/misc/repositories.manifest index 1a41290..8621912 100644 --- a/tests/load/1/misc/repositories.manifest +++ b/tests/load/1/misc/repositories.manifest @@ -2,6 +2,7 @@ # Foreign repository manifest. # location: ../basics +role: prerequisite : # Adjacent repository manifest. # diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest index dd44465..45bc015 100644 --- a/tests/load/1/stable/packages.manifest +++ b/tests/load/1/stable/packages.manifest @@ -1,5 +1,5 @@ : 1 -sha256sum: 9b6076157ba27e9e93b4f14116d5305a8d6b325879d7799fef1df1b1f5aa8775 +sha256sum: 17ae44db4b176fc7629fe9a6a5e43aa9ab4da0fda2b93f3b1fe6e993ba92cd8b : name: libfoo version: 1.0 diff --git a/tests/load/1/stable/repositories.manifest b/tests/load/1/stable/repositories.manifest index ffe08ef..49a0685 100644 --- a/tests/load/1/stable/repositories.manifest +++ b/tests/load/1/stable/repositories.manifest @@ -2,10 +2,12 @@ # Foreign repository manifest. # location: ../misc +role: prerequisite : # Adjacent repository manifest. # location: ../math +role: prerequisite : # Local repository manifest (this repository). # diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest index 5ffaac5..0da4d07 100644 --- a/tests/load/1/stable/signature.manifest +++ b/tests/load/1/stable/signature.manifest @@ -1,13 +1,13 @@ : 1 -sha256sum: 9fbdd1c492eabf0e98deabc54fc8ea7aa2de1627b28682e5030b09f20a5a7bab +sha256sum: 7ba11b5c9050827ba50dcb888e4f514fcfdd0f301e56640caf54226310f4fdad signature: \ -dNXN44XB+9u/hfFDgYnFlmoIeR0nzvSIlyGdT49cR7LvyRmMapmd+00pYcffr2JZeoRh7+ngmRjQ -7i+NQGcf1X4abZb5Oi/qyfM7Vqofh7T8GLj2PeJiOL1U3dpmYbgqz3U6u3mwH6w0r83HAN1BA5kB -xxtwpFuGlpkUwyJ5gjUzBjNabdcYcp0UwQWwnru7RpuZbZumImCGwjorPnazlOXU8sfdfV3LnojM -nvMUsnRC19dKMrUfyEUeBJ7sifWfaMTJl0Ct9IOQ4cd6E1lOUnKA5pFm56xPn39/TOdwp/NNxEPx -HvX8/nPHwIvDUwLuKXQB/SB1xt8iGowhUkApNZ44+OTBFa9AGYylS3M9e12RmqyKUSuYH7tqtxla -HiZqA+f4Hxi+2VqAki8da8RPgKc18n1nmvEH1bijgw0yhQo2nLQMHUWKlrmJ2kCxNVoTrmSsTzuB -mzNbdIoL3/vadVaiqrEHsLaEDl2bOtDD2+d16pjXvcooRKHCPTJZ7vus8umqlwemmhze4PADTyXu -MToZ5SNtjCJ/aIJk00t7rcfECawtm9+HKplBbhtpzoDxZ9pAI2mvmNW0ayD32vgyBzC4E/fTcT2O -XVLqP9VG2aSESO9T9B1Q0anQ46N8eNd1RryOmIF8nSw8J60enKsE7ZdLhvhp/KEgU7MSuQ0e46M= +w4bLp8f6qGuRkNQE4Dh7+04HJFwlJXfe/qw2Mr41ERnER1nIgwTcF8e+PyUcyLXG9D/3RQ/vqec7 +kpqng0uOXl89dp9C0pwpFV/AntAOg7KeRz73NO30yrgk7gdZYd2/2SR82aYIlcdZxVcwf0kUGyuO +MPcdYQpUozgC2bwzL4LAh+Ky8deacR0ICLkt+4TjKP9rVvPlX82pDPWxYt7wxo6m4i4nXKLQXvHA +Gy59NKQx1+0cEP68RxBrsygfmG4uKWTgRZm2xWuYvwN94q+gGw7s6rkKYLF2/Ndm9vYOig49Kt5i +l7HaPXVMfzYvF/FmqQutk9cOvhkOaHdh+xDbLTOXxQynnYloq3lDxFyaw3ITUzmaONTP5+tVyWji +sOdhMs2URnjyPgrWm7IGAtSd135chXPROIiOqQ4GUZiUkZTjBnsOes/PSPFp7kJwBXG4ogJ09N4D +myeoNSeAdN0ZMR0Pm7eKIcEJXRNH0V78gxVC6j83iwSanMit+tODeikGkck9ndE6s+Ms0trSfao3 +Pq+im6iz3X0jD1i5IaQZCiDkS1oeVvbdyvvVuaCJuujLZd6HnxYTonEl4ZCwrkurYbLyIjApCdx4 +u31dT1Y5r7Xu+3nGQOaO8aXshkB/roID3vklMIJeXE7nXLnmyjsXcxLWm6tbUALBjoxpQNs2jzU= \ diff --git a/tests/load/cert b/tests/load/cert index 62412a7..893d84d 100755 --- a/tests/load/cert +++ b/tests/load/cert @@ -19,5 +19,4 @@ openssl req -x509 -new -key key.pem -days 1825 -config openssl.cnf > cert.pem # Update certificate fingerprint in loadtab for dev.cppget.org/signed # repository. To print the fingerprint run: # -# ../../../bpkg/bpkg/bpkg rep-info --cert-fingerprint \ -# tests/load/pkg/1/dev.cppget.org/signed/ +# ../../../bpkg/bpkg/bpkg rep-info --cert-fingerprint pkg/1/dev.cppget.org/signed/ -- cgit v1.1