File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -175,9 +175,11 @@ archive_consumer() {
175175 " $MCPP " pack --format dir > target/ci/pack.log 2>&1 || { cat target/ci/pack.log; fail " mcpp pack failed" ; }
176176 find target/dist -path ' */runtime/bundle/nested/deep.txt' | grep -q . ||
177177 fail " the packed tree does not carry the archive's files"
178+ # A PE program sits at the root of the packed tree, an ELF or Mach-O one
179+ # under bin/; the deployed files are beside it either way.
178180 local packed
179- packed=$( find target/dist -path ' */bin/ archive-consumer* ' -type f | grep -vE ' \.(pdb|debug)$ ' | head -1)
180- [ -n " $packed " ] || fail " no packed program"
181+ packed=$( find target/dist -type f \( -name archive-consumer -o -name archive-consumer.exe \) | head -1 || true )
182+ [ -n " $packed " ] || fail " no packed program under target/dist "
181183 " $packed " | grep -q " ^archive-consumer: 'greetings from the archive'" ||
182184 fail " the packed program did not read the archive's files"
183185 echo " ok: the packed tree carries the archive's files, and the packed program reads them"
You can’t perform that action at this time.
0 commit comments