diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index fc254ade48..5370408b26 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -79,4 +79,4 @@ jobs: - if: ${{ matrix.os == 'ubuntu-latest' }} name: run urbit-tests run: | - nix flake check --keep-build-log + nix flake check --keep-build-log -L diff --git a/nix/test-fake-ship.nix b/nix/test-fake-ship.nix index 18d1f8bf22..00bddfaeab 100644 --- a/nix/test-fake-ship.nix +++ b/nix/test-fake-ship.nix @@ -35,7 +35,7 @@ let ${poke} =/ m (strand ,vase) ;< [=ship =desk =case] bind:m get-beak - ;< ok=? bind:m (poke [ship %dojo] %lens-command !>([%$ [%dojo '${dojoCommand}'] [%output-file 'result/noun']])) + ;< ok=? bind:m (poke [ship %dojo] %lens-command !>([%$ [%dojo '${dojoCommand}'] [%stdout ~]])) (pure:m !>(ok)) ''; }; @@ -93,24 +93,20 @@ in pkgs.stdenvNoCC.mkDerivation { ${click} -k -p -i ${pokeApp "%generators" "noun" "test"} ./pier ${click} -k -p -i ${pokeApp "%marks" "noun" "test"} ./pier - # The rest of the commands fail for unknown reasons. + ${click} -k -p -i ${appThread "mass" "hood"} ./pier + sleep 2 - # ${click} -k -p -i ${appThread "mass" "hood"} ./pier - # sleep 2 + ${click} -k -p -i ${pokeApp "~" "helm-pack" "hood"} ./pier - # ${click} -k -p -i ${pokeApp "~" "helm-pack" "hood"} ./pier + ${click} -k -p -i ${appThread "trim" "hood"} ./pier - # ${click} -k -p -i ${appThread "trim" "hood"} ./pier + ${click} -k -p -i ${appThread "mass" "hood"} ./pier - # ${click} -k -p -i ${appThread "mass" "hood"} ./pier + ${click} -k -p -i ${appThread "meld" "hood"} ./pier - # ${click} -k -p -i ${appThread "meld" "hood"} ./pier + ${click} -k -p -i ${appThread "mass" "hood"} ./pier - # sleep 60 - - # ${click} -k -p -i ${appThread "mass" "hood"} ./pier - - # ${click} -k -p -i ${appThread "exit" "hood"} ./pier + ${click} -k -p -i ${appThread "exit" "hood"} ./pier set +x ''; diff --git a/pkg/base-dev/lib/strandio.hoon b/pkg/base-dev/lib/strandio.hoon index 6735d9060a..f49ee172eb 100644 --- a/pkg/base-dev/lib/strandio.hoon +++ b/pkg/base-dev/lib/strandio.hoon @@ -581,8 +581,9 @@ ++ check-for-file |= [[=ship =desk =case] =spur] =/ m (strand ,?) - ;< =riot:clay bind:m (warp ship desk ~ %sing %x case spur) - (pure:m ?=(^ riot)) + ;< =riot:clay bind:m (warp ship desk ~ %sing %u case spur) + ?> ?=(^ riot) + (pure:m !<(? q.r.u.riot)) :: ++ list-tree |= [[=ship =desk =case] =spur]