Merge remote-tracking branch 'origin/topic/awelzel/builtin-plugins-zeek-build-info'

awelzel · awelzel · commit 71450647c1a5 · 2023-06-22T17:02:33.000+02:00
* origin/topic/awelzel/builtin-plugins-zeek-build-info:
  bundle/unbundle: Rework built-in dependency check
  manager: Do not include built-in packages in manifest
  package: Add PackageVersion
  Add built-in package awareness
  zkg: Log warnings by default
  package: Add a few __repr__() implementations
  _util: Add ZeekInfo helper class
diff --git a/testing/baselines/tests.builtin-info/out b/testing/baselines/tests.builtin-info/out
@@ -0,0 +1,14 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+"zeek-builtin/spicy-plugin" info:
+	url: zeek-builtin://spicy-plugin
+	versions: ['X.X.X']
+	install status:
+		current_hash = None
+		current_version = X.X.X
+		is_loaded = True
+		is_outdated = False
+		is_pinned = True
+		tracking_method = builtin
+	metadata (from version ""):
+		<empty metadata file>
+
diff --git a/testing/baselines/tests.builtin-install/out b/testing/baselines/tests.builtin-install/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+cannot install "spicy-plugin": built-in package
diff --git a/testing/baselines/tests.builtin-list/out b/testing/baselines/tests.builtin-list/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+zeek-builtin/spicy-plugin (installed: X.X.X)
diff --git a/testing/baselines/tests.builtin-pin/out b/testing/baselines/tests.builtin-pin/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+cannot pin "spicy-plugin": built-in package
diff --git a/testing/baselines/tests.builtin-remove/out b/testing/baselines/tests.builtin-remove/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+cannot remove "spicy-plugin": built-in package
diff --git a/testing/baselines/tests.builtin-spicy-bundle/.stderr b/testing/baselines/tests.builtin-spicy-bundle/.stderr
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Switched to a new branch 'main'
+Switched to a new branch 'drop-corge'
+Switched to branch 'master'
diff --git a/testing/baselines/tests.builtin-spicy-bundle/bundle.manifest.txt b/testing/baselines/tests.builtin-spicy-bundle/bundle.manifest.txt
@@ -0,0 +1,7 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+[bundle]
+<...>/foo = main
+
+[meta]
+builtin_packages = spicy-plugin=X.X.X
+
diff --git a/testing/baselines/tests.builtin-spicy-bundle/output b/testing/baselines/tests.builtin-spicy-bundle/output
@@ -0,0 +1,8 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Running unit tests for "one/alice/foo"
+Installing "one/alice/foo"
+Installed "one/alice/foo" (main)
+Loaded "one/alice/foo"
+Bundle successfully written: bundle.tar
+Loaded "one/alice/foo"
+Unbundling complete.
diff --git a/testing/baselines/tests.builtin-spicy-bundle/package.log b/testing/baselines/tests.builtin-spicy-bundle/package.log
@@ -0,0 +1,5 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Building foo
+Testing foo
+Building foo
+Building foo
diff --git a/testing/baselines/tests.builtin-spicy-version-error/output b/testing/baselines/tests.builtin-spicy-version-error/output
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error: failed to resolve dependencies: unsatisfiable dependency: "zeek-builtin/spicy-plugin" (X.X.X) is installed, but "one/alice/foo" requires <X.X.X (X.X.X not in <X.X.X)
diff --git a/testing/baselines/tests.builtin-spicy-version/output b/testing/baselines/tests.builtin-spicy-version/output
@@ -0,0 +1,5 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Running unit tests for "one/alice/foo"
+Installing "one/alice/foo"
+Installed "one/alice/foo" (main)
+Loaded "one/alice/foo"
diff --git a/testing/baselines/tests.builtin-spicy-version/package.log b/testing/baselines/tests.builtin-spicy-version/package.log
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Building foo
+Testing foo
+Building foo
diff --git a/testing/baselines/tests.builtin-spicy/output b/testing/baselines/tests.builtin-spicy/output
@@ -0,0 +1,4 @@
+Running unit tests for "one/alice/foo"
+Installing "one/alice/foo"
+Installed "one/alice/foo" (main)
+Loaded "one/alice/foo"
diff --git a/testing/baselines/tests.builtin-spicy/package.log b/testing/baselines/tests.builtin-spicy/package.log
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Building foo
+Testing foo
+Building foo
diff --git a/testing/baselines/tests.builtin-test/out b/testing/baselines/tests.builtin-test/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+cannot run tests for "spicy-plugin": built-in package
diff --git a/testing/baselines/tests.builtin-unload/out b/testing/baselines/tests.builtin-unload/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+cannot unload "spicy-plugin": built-in package
diff --git a/testing/baselines/tests.builtin-unpin/out b/testing/baselines/tests.builtin-unpin/out
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+cannot unpin "spicy-plugin": built-in package
diff --git a/testing/baselines/tests.bundle-missing-dependency/.stderr b/testing/baselines/tests.bundle-missing-dependency/.stderr
@@ -0,0 +1,6 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Switched to a new branch 'main'
+Switched to a new branch 'drop-corge'
+Switched to branch 'master'
+Switched to a new branch 'origin/main'
+XXXX-XX-XX XX:XX:XX WARNING  dependency "zkg-test-plugin" of bundled "<...>/foo" missing
diff --git a/testing/baselines/tests.bundle-missing-dependency/output b/testing/baselines/tests.bundle-missing-dependency/output
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Loaded "/one/alice/foo"
+Unbundling complete.
+/one/alice/foo (installed: main)
diff --git a/testing/baselines/tests.bundle-missing-dependency/package.log b/testing/baselines/tests.bundle-missing-dependency/package.log
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Building foo
diff --git a/testing/baselines/tests.bundle-unsatisfied-dependency/.stderr b/testing/baselines/tests.bundle-unsatisfied-dependency/.stderr
@@ -0,0 +1,6 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Switched to a new branch 'main'
+Switched to a new branch 'drop-corge'
+Switched to branch 'master'
+Switched to a new branch 'origin/main'
+XXXX-XX-XX XX:XX:XX WARNING  dependency "spicy-plugin" (X.X.X) of "<...>/foo" not compatible with "<6.0.0"
diff --git a/testing/baselines/tests.bundle-unsatisfied-dependency/output b/testing/baselines/tests.bundle-unsatisfied-dependency/output
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Loaded "/one/alice/foo"
+Unbundling complete.
+/one/alice/foo (installed: main)
diff --git a/testing/baselines/tests.bundle-unsatisfied-dependency/package.log b/testing/baselines/tests.bundle-unsatisfied-dependency/package.log
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Building foo
diff --git a/testing/baselines/tests.installed-dependency-conflict/conflict.out b/testing/baselines/tests.installed-dependency-conflict/conflict.out
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error: failed to resolve dependencies: unsatisfiable dependency: "one/alice/bar" (1.0.0) is installed, but "one/alice/foo" requires =2.0.0
+error: failed to resolve dependencies: unsatisfiable dependency: "one/alice/bar" (1.0.0) is installed, but "one/alice/foo" requires =2.0.0 (1.0.0 not in =2.0.0)
diff --git a/testing/baselines/tests.validate-manifest/packages.txt b/testing/baselines/tests.validate-manifest/packages.txt
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+0 alice foo one
+1 alice bar one
+2 alice baz one
diff --git a/testing/tests/builtin-info b/testing/tests/builtin-info
@@ -0,0 +1,6 @@
+# @TEST-DOC: Using info on a built-in package works
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC: zkg info spicy-plugin | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+/X.X.X/g' >out
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-install b/testing/tests/builtin-install
@@ -0,0 +1,6 @@
+# @TEST-DOC: Ensure that installing spicy-plugin fails if it's built-in (default for 6.0)
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC-FAIL: zkg install spicy-plugin >out 2>&1
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-list b/testing/tests/builtin-list
@@ -0,0 +1,6 @@
+# @TEST-DOC: Listing packages with --include-builtin shows built-in packages.
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC: zkg list --include-builtin | grep spicy-plugin | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+/X.X.X/g' >out
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-pin b/testing/tests/builtin-pin
@@ -0,0 +1,6 @@
+# @TEST-DOC: Ensure that pinning spicy-plugin fails if it's built-in (default for 6.0)
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC-FAIL: zkg pin spicy-plugin >out 2>&1
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-remove b/testing/tests/builtin-remove
@@ -0,0 +1,6 @@
+# @TEST-DOC: Ensure that removing spicy-plugin fails if it's built-in (default for 6.0)
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC-FAIL: zkg remove spicy-plugin >out 2>&1
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-spicy b/testing/tests/builtin-spicy
@@ -0,0 +1,22 @@
+# @TEST-DOC: Ensure a package that requires spicy-plugin installs when spicy-plugin is built-in
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC: bash %INPUT
+# @TEST-EXEC: zkg install foo > output
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: btest-diff package.log
+#
+
+export LOG=$(pwd)/package.log
+
+(
+    cd packages/foo
+    cat >>zkg.meta <<EOF
+test_command = echo "Testing foo" >> $LOG
+build_command = echo "Building foo" >> $LOG
+depends =
+  spicy-plugin *
+EOF
+    git commit -am 'foo: depends on spicy-plugin'
+)
diff --git a/testing/tests/builtin-spicy-bundle b/testing/tests/builtin-spicy-bundle
@@ -0,0 +1,28 @@
+# @TEST-DOC: Bundle foo which depends spicy-plugin (built-in) and check the created manifest.txt
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+# @TEST-REQUIRES: tar --version
+#
+# @TEST-EXEC: bash %INPUT
+# @TEST-EXEC: zkg install foo > output
+# @TEST-EXEC: zkg bundle bundle.tar --manifest foo  >> output
+# @TEST-EXEC: zkg unbundle bundle.tar >> output
+# @TEST-EXEC: mkdir bundle && tar -C bundle -xf bundle.tar
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/(.*)=[0-9]+\.[0-9]+\.[0-9]+/\1=X.X.X/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff bundle/manifest.txt
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: btest-diff .stderr
+# @TEST-EXEC: btest-diff package.log
+#
+
+export LOG=$(pwd)/package.log
+
+(
+    cd packages/foo
+    cat >>zkg.meta <<EOF
+test_command = echo "Testing foo" >> $LOG
+build_command = echo "Building foo" >> $LOG
+depends =
+  spicy-plugin >=6.0.0
+EOF
+    git commit -am 'foo: depends on spicy-plugin'
+)
diff --git a/testing/tests/builtin-spicy-version b/testing/tests/builtin-spicy-version
@@ -0,0 +1,22 @@
+# @TEST-DOC: Ensure a package that requires a certain spicy-plugin version works with built-in spicy.
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC: bash %INPUT
+# @TEST-EXEC: zkg install foo > output
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: btest-diff package.log
+#
+
+export LOG=$(pwd)/package.log
+
+(
+    cd packages/foo
+    cat >>zkg.meta <<EOF
+test_command = echo "Testing foo" >> $LOG
+build_command = echo "Building foo" >> $LOG
+depends =
+  spicy-plugin >=6.0.0
+EOF
+    git commit -am 'foo: depends on spicy-plugin'
+)
diff --git a/testing/tests/builtin-spicy-version-error b/testing/tests/builtin-spicy-version-error
@@ -0,0 +1,23 @@
+# @TEST-DOC: Package depends for built-in Spicy cannot be fulfilled with built-in package.
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC: bash %INPUT
+# @TEST-EXEC-FAIL: zkg install foo >output.orig 2>&1
+# @TEST-EXEC: sed -r 's/[0-9]+\.[0-9]+\.[0-9]+/X.X.X/g' <output.orig >output
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: test ! -f package.log
+#
+
+export LOG=$(pwd)/package.log
+
+(
+    cd packages/foo
+    cat >>zkg.meta <<EOF
+test_command = echo "Testing foo" >> $LOG
+build_command = echo "Building foo" >> $LOG
+depends =
+  spicy-plugin <6.0.0
+EOF
+    git commit -am 'foo: depends on old spicy-plugin'
+)
diff --git a/testing/tests/builtin-test b/testing/tests/builtin-test
@@ -0,0 +1,6 @@
+# @TEST-DOC: Ensure that testing spicy-plugin fails if it's built-in (default for 6.0)
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC-FAIL: zkg test spicy-plugin >out 2>&1
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-unload b/testing/tests/builtin-unload
@@ -0,0 +1,6 @@
+# @TEST-DOC: Ensure that unloading spicy-plugin fails if it's built-in (default for 6.0)
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC-FAIL: zkg unload spicy-plugin >out 2>&1
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/builtin-unpin b/testing/tests/builtin-unpin
@@ -0,0 +1,6 @@
+# @TEST-DOC: Ensure that unpinning spicy-plugin fails if it's built-in (default for 6.0)
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+#
+# @TEST-EXEC-FAIL: zkg unpin spicy-plugin >out 2>&1
+# @TEST-EXEC: btest-diff out
diff --git a/testing/tests/bundle-missing-dependency b/testing/tests/bundle-missing-dependency
@@ -0,0 +1,33 @@
+# @TEST-DOC: Create a bundle by hand with a package depending on "zkg-test-plugin" which does not exist, observe a warning during unbundling.
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+# @TEST-REQUIRES: tar --version
+#
+# @TEST-EXEC: bash %INPUT
+#
+# @TEST-EXEC: zkg unbundle bundle.tar >> output
+# @TEST-EXEC: zkg list >> output
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/[0-9]{2}/XX/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr
+# @TEST-EXEC: btest-diff package.log
+#
+
+export LOG=$(pwd)/package.log
+
+(
+    cd packages/foo
+    cat >>zkg.meta <<EOF
+test_command = echo "Testing foo" >> $LOG
+build_command = echo "Building foo" >> $LOG
+depends =
+  zkg-test-plugin >=6.0.0
+EOF
+    git commit -am 'foo: depends on zkg-test-plugin'
+    git checkout -b origin/main
+)
+
+# Create a bundle
+mkdir the-bundle
+cp -R packages/foo ./the-bundle
+echo -e '[bundle]\n/one/alice/foo = main' >> the-bundle/manifest.txt
+tar -cf bundle.tar -C ./the-bundle .
diff --git a/testing/tests/bundle-unsatisfied-dependency b/testing/tests/bundle-unsatisfied-dependency
@@ -0,0 +1,33 @@
+# @TEST-DOC: Create a bundle by hand with a package depending on "spicy-plugin<6.0.0" which isn't satisfiable. Observe a warning during unbundling.
+#
+# @TEST-REQUIRES: zeek -e 'exit(Version::at_least("6.0.0") ? 0 : 1)'
+# @TEST-REQUIRES: tar --version
+#
+# @TEST-EXEC: bash %INPUT
+#
+# @TEST-EXEC: zkg unbundle bundle.tar >> output
+# @TEST-EXEC: zkg list >> output
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/[0-9]{2}/XX/g" | sed -r "s/\(.\..\..\)/(X.X.X)/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr
+# @TEST-EXEC: btest-diff package.log
+#
+
+export LOG=$(pwd)/package.log
+
+(
+    cd packages/foo
+    cat >>zkg.meta <<EOF
+test_command = echo "Testing foo" >> $LOG
+build_command = echo "Building foo" >> $LOG
+depends =
+  spicy-plugin <6.0.0
+EOF
+    git commit -am 'foo: depends on spicy-plugin'
+    git checkout -b origin/main
+)
+
+# Create a bundle
+mkdir the-bundle
+cp -R packages/foo ./the-bundle
+echo -e '[bundle]\n/one/alice/foo = main' >> the-bundle/manifest.txt
+tar -cf bundle.tar -C ./the-bundle .
diff --git a/testing/tests/install-force-build-fail b/testing/tests/install-force-build-fail
@@ -5,7 +5,7 @@
 
 # @TEST-EXEC: zkg install bar
 #
-# @TEST-EXEC-FAIL: zkg -v install --force --skiptests foo >>out 2>&1
+# @TEST-EXEC-FAIL: zkg install --force --skiptests foo >>out 2>&1
 # @TEST-EXEC: echo "have_load_bar=$(grep -c '@load.*bar' ./scripts/packages/packages.zeek)" >>out
 # @TEST-EXEC: echo "have_load_foo=$(grep -c '@load.*foo' ./scripts/packages/packages.zeek)" >>out
 #
diff --git a/testing/tests/install-force-test-fail b/testing/tests/install-force-test-fail
@@ -4,12 +4,12 @@
 # @TEST-EXEC: bash %INPUT
 
 # @TEST-EXEC: echo "=== install without skiptests" >>out
-# @TEST-EXEC-FAIL: zkg -v install --force foo >>out 2>&1
+# @TEST-EXEC-FAIL: zkg install --force foo >>out 2>&1
 # @TEST-EXEC: echo "have_load_foo=$(grep -c '@load.*foo' ./scripts/packages/packages.zeek)" >>out
 #
 # @TEST-EXEC: rm -rf ./state
 # @TEST-EXEC: echo "=== install with skiptests" >>out
-# @TEST-EXEC: zkg -v install --force --skiptests foo >>out 2>&1
+# @TEST-EXEC: zkg install --force --skiptests foo >>out 2>&1
 # @TEST-EXEC: echo "have_load_foo=$(grep -c '@load.*foo' ./scripts/packages/packages.zeek)" >>out
 #
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
diff --git a/testing/tests/refresh b/testing/tests/refresh
@@ -10,16 +10,19 @@
 
 # With --fail-on-aggregate problems, the following should fail since
 # there are metadata problems in the package set.
-# @TEST-EXEC-FAIL: zkg -vvv refresh --aggregate --fail-on-aggregate-problems >agg.fail.out 2>agg.fail.errout
+# @TEST-EXEC-FAIL: zkg -vvv refresh --aggregate --fail-on-aggregate-problems >agg.fail.out 2>agg.fail.errout.orig
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff agg.fail.out
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-canonifier btest-diff agg.fail.errout
+# @TEST-EXEC: grep -v 'built-in package' < agg.fail.errout.orig > agg.fail.errout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='$SCRIPTS/diff-canonifier' btest-diff agg.fail.errout
 
 # Remove the aggregated metadata so the next invocation has a clean slate
 # @TEST-EXEC: rm -f state/clones/source/one/aggregate.meta
 
 # This time we trigger only warnings for offending packages, commit, and push.
-# @TEST-EXEC: zkg -vvv refresh --aggregate --push >agg.out 2>agg.errout
+# @TEST-EXEC: zkg -vvv refresh --aggregate --push >agg.out 2>agg.errout.orig
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff agg.out
+# @TEST-EXEC: grep -v 'built-in package' < agg.errout.orig > agg.errout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='$SCRIPTS/diff-canonifier' btest-diff agg.fail.errout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-canonifier btest-diff agg.errout
 
 # @TEST-EXEC: zkg search lucky > search.out
diff --git a/testing/tests/validate-manifest b/testing/tests/validate-manifest
diff --git a/zeekpkg/_util.py b/zeekpkg/_util.py
diff --git a/zeekpkg/manager.py b/zeekpkg/manager.py
diff --git a/zeekpkg/package.py b/zeekpkg/package.py
diff --git a/zkg b/zkg

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.`
	`2`	`+cannot install "spicy-plugin": built-in package`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.`
	`2`	`+zeek-builtin/spicy-plugin (installed: X.X.X)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.`
	`2`	`+cannot pin "spicy-plugin": built-in package`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.`
	`2`	`+cannot remove "spicy-plugin": built-in package`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.`
	`2`	`+error: failed to resolve dependencies: unsatisfiable dependency: "zeek-builtin/spicy-plugin" (X.X.X) is installed, but "one/alice/foo" requires <X.X.X (X.X.X not in <X.X.X)`