diff options
Diffstat (limited to 'tests/manifest')
| -rw-r--r-- | tests/manifest/driver.cxx | 12 | ||||
| -rw-r--r-- | tests/manifest/testscript | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx index 9c58dcf..caca79d 100644 --- a/tests/manifest/driver.cxx +++ b/tests/manifest/driver.cxx @@ -21,9 +21,9 @@ using namespace bpkg; // Read and parse manifest from STDIN and serialize it to STDOUT. The // following options specify the manifest type. // -// -bp parse bpkg package manifest list +// -pp parse pkg package manifest list // -gp parse git package manifest list -// -br parse bpkg repository manifest list +// -pr parse pkg repository manifest list // -gr parse git repository manifest list // -s parse signature manifest // @@ -39,10 +39,10 @@ main (int argc, char* argv[]) manifest_parser p (cin, "stdin"); manifest_serializer s (cout, "stdout"); - if (opt == "-bp") - bpkg_package_manifests (p).serialize (s); - else if (opt == "-br") - bpkg_repository_manifests (p).serialize (s); + if (opt == "-pp") + pkg_package_manifests (p).serialize (s); + else if (opt == "-pr") + pkg_repository_manifests (p).serialize (s); else if (opt == "-gp") git_package_manifests (p).serialize (s); else if (opt == "-gr") diff --git a/tests/manifest/testscript b/tests/manifest/testscript index 3f0d38d..68ceced 100644 --- a/tests/manifest/testscript +++ b/tests/manifest/testscript @@ -5,14 +5,14 @@ : packages : { - : bpkg + : pkg : { : manifest : - : Roundtrip the bpkg package manifest list. + : Roundtrip the pkg package manifest list. : - $* -bp <<EOF >>EOF + $* -pp <<EOF >>EOF : 1 sha256sum: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 : @@ -101,21 +101,21 @@ : repositories : { - : bpkg + : pkg : { : manifest : - : Roundtrip the bpkg repository manifest list. + : Roundtrip the pkg repository manifest list. : - $* -br <<EOF >>EOF + $* -pr <<EOF >>EOF : 1 location: http://pkg.example.org/1/math - type: bpkg + type: pkg role: prerequisite : location: ../stable - type: bpkg + type: pkg role: complement : url: http://cppget.org @@ -159,7 +159,7 @@ : prerequisite-type : - $* -br <<EOI >>EOO + $* -pr <<EOI >>EOO : 1 location: http://example.org/math.git#master role: prerequisite @@ -182,7 +182,7 @@ role: prerequisite : location: ../stable.git - type: bpkg + type: pkg role: complement : location: git://example.org/foo#master @@ -190,7 +190,7 @@ role: prerequisite : location: http://pkg.example.org/1/bar - type: bpkg + type: pkg role: prerequisite : url: http://cppget.org @@ -254,7 +254,7 @@ role: prerequisite : location: http://pkg.example.org/1/bar - type: bpkg + type: pkg role: prerequisite : url: http://cppget.org |