chiark / gitweb /
Ian Jackson [Sat, 10 Jul 2021 10:47:29 +0000 (11:47 +0100)]
jjstest: lower: formatting of test cases and output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Jul 2021 00:24:04 +0000 (01:24 +0100)]
session: Get rid of a now-pointless vec copy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 23:21:52 +0000 (00:21 +0100)]
wdt-bundles: vatikan: Have bob load the game
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Jul 2021 00:22:09 +0000 (01:22 +0100)]
session: Sort by visible z order on game load (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 23:58:05 +0000 (00:58 +0100)]
wdt-bundles: vatikan: Have alice draw some cards
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 23:58:35 +0000 (00:58 +0100)]
wdriver: Pass window size to firefox
Despite the usage message, these are the correct arguments,
empirically.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 23:56:07 +0000 (00:56 +0100)]
wdriver: Introduce firefox-wrapper
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 21:26:19 +0000 (22:26 +0100)]
script: Add new check_z_order arrangement
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 21:19:50 +0000 (22:19 +0100)]
js test: provide otter_debug variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 21:13:15 +0000 (22:13 +0100)]
js test: Rename log-save to test-inject
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:56:31 +0000 (19:56 +0100)]
jstest: lower: Note a rune for checking the sort invariant
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:31:07 +0000 (19:31 +0100)]
jstest: lower: from-pieces helper script
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:27:15 +0000 (19:27 +0100)]
jstest: lower: from-pieces helper script
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:08:01 +0000 (19:08 +0100)]
jstest: lower: broaden a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:06:58 +0000 (19:06 +0100)]
jstest: lower: add another test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:04:49 +0000 (19:04 +0100)]
jstest: lower: all intended tests implemented now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:04:36 +0000 (19:04 +0100)]
jstest: lower: implement a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:01:34 +0000 (19:01 +0100)]
jstest: lower: implement a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 18:01:11 +0000 (19:01 +0100)]
jstest: lower: implement a test, restyle
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:59:29 +0000 (18:59 +0100)]
jstest: lower: implement a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:58:17 +0000 (18:58 +0100)]
jstest: lower: implement a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:49:38 +0000 (18:49 +0100)]
jstest: lower: use new old new for check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:47:34 +0000 (18:47 +0100)]
jstest: lower: Much nicer debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:24:22 +0000 (18:24 +0100)]
jstest: lower: Include target in Collated, and tidy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:24:09 +0000 (18:24 +0100)]
jstest: Make targets be an IndexVec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 17:19:13 +0000 (18:19 +0100)]
jstest: lower: wip after and before
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 16:56:57 +0000 (17:56 +0100)]
jstest: lower: introduce Vpid
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:46:43 +0000 (14:46 +0100)]
jstest: lower: Only do order check for non-bottom targets
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:46:37 +0000 (14:46 +0100)]
jstest: lower: note some more wanted checks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:46:22 +0000 (14:46 +0100)]
jstest: lower: add a test with 2 lowerings
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:42:55 +0000 (14:42 +0100)]
jstest: lower: check targets not deranged
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:42:33 +0000 (14:42 +0100)]
jstest: lower: script: fix multiple pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:42:21 +0000 (14:42 +0100)]
jstest: lower: script: improve formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 13:00:50 +0000 (14:00 +0100)]
jstest: lower: move template to bottom, out of the way
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 12:59:36 +0000 (13:59 +0100)]
jstest: lower: note some more wanted checks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 11:34:37 +0000 (12:34 +0100)]
jstest: lower: Improve an assert message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 11:13:36 +0000 (12:13 +0100)]
jstest: lower: Remove now-redundant id field
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 11:12:51 +0000 (12:12 +0100)]
jstest: lower: Make Test::pieces be an IndexMap
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 11:05:13 +0000 (12:05 +0100)]
jstest: lower: Note checks we want to make
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 11:04:54 +0000 (12:04 +0100)]
jstest: lower: make targets be vpid
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 00:38:38 +0000 (01:38 +0100)]
jstest: lower: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 00:26:36 +0000 (01:26 +0100)]
jstest: Change type of piece id
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 00:23:25 +0000 (01:23 +0100)]
jstest: Tidy formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 20:16:52 +0000 (21:16 +0100)]
jstest: Programattically generate a test csase, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 20:03:34 +0000 (21:03 +0100)]
jat-lower: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:40:16 +0000 (20:40 +0100)]
jstest: Provide for wrapping
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:32:34 +0000 (20:32 +0100)]
jstest: Introduce Rust helper code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:32:11 +0000 (20:32 +0100)]
script: Remove a spurious HTML comment end marker
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:31:57 +0000 (20:31 +0100)]
jstest: add missing copyright blocks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:51:08 +0000 (19:51 +0100)]
jstest: loower: skeleton/example
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:50:44 +0000 (19:50 +0100)]
jstest: run1: make expected output optional
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:26:22 +0000 (19:26 +0100)]
jstest: run1: show whole console log output on failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:14:25 +0000 (19:14 +0100)]
jstest: wip lower test, currently just a skeleton
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:39:44 +0000 (13:39 +0100)]
Makefile: touch the otter cli when we rebuild it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:39:30 +0000 (13:39 +0100)]
jstest: Rename the one test we have so far, again
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:38:50 +0000 (13:38 +0100)]
jstest: Rename the one test we have so far
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:33:56 +0000 (13:33 +0100)]
jstest: expected output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:29:39 +0000 (13:29 +0100)]
jstest: prep for multiple tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:25:43 +0000 (13:25 +0100)]
jstest: prep for multiple tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:19:46 +0000 (13:19 +0100)]
jstest: Include script plumbing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:13:47 +0000 (13:13 +0100)]
jstest: Drop some now-superseded wip note comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:09:38 +0000 (13:09 +0100)]
jstest: Add emacs mode comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:12:53 +0000 (13:12 +0100)]
jstest: wire up to check target
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:09:26 +0000 (13:09 +0100)]
Makefile: jstest can run from Makefile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:05:44 +0000 (13:05 +0100)]
Makefile: move --no-modules out of WASM_BINDGEN_OPTIONS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Jul 2021 23:32:54 +0000 (00:32 +0100)]
jstest: wip, it runs, with the runes in the comments, as a bodge
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Jul 2021 22:58:00 +0000 (23:58 +0100)]
jstest: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Jul 2021 17:26:56 +0000 (18:26 +0100)]
vatikan: Make green and purple hands bigger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:57:05 +0000 (01:57 +0100)]
script: raise: log a message when nothing oculd be raised
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:42:37 +0000 (01:42 +0100)]
script: bind 't' to new explicit raise feature
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:42:33 +0000 (01:42 +0100)]
script: Break out piece_raise
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:39:05 +0000 (01:39 +0100)]
script: break out piece_moveable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:32:32 +0000 (01:32 +0100)]
script: section boundary for lowering code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 21:00:45 +0000 (22:00 +0100)]
script: Do not re-raise things that were explicitly lowered
This fixes an annoying UI issue where if you would lower a thing while
dragging it, the auto-raie on release would still happen, re-raising
it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 20:47:35 +0000 (21:47 +0100)]
script: Change held_us_raising to its own type
We're going to fix the raise-after-lower bug in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:58:29 +0000 (20:58 +0100)]
script: dragging: Make this hex
In case we every want to add more. (We don't right now, it turns
out.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:55:54 +0000 (20:55 +0100)]
hand: Show count of items occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:55:38 +0000 (20:55 +0100)]
ui: break out occultation_notify_update_image
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:53:28 +0000 (20:53 +0100)]
deck: Make count use a monospaced font
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:50:15 +0000 (20:50 +0100)]
ui: break out monospace_font
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:50:01 +0000 (20:50 +0100)]
demo game: Add a label to the test hand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 22:23:58 +0000 (23:23 +0100)]
script: Make non-moveable pieces bottom, when lowerint
This avoids lowering pieces below the hand they are in, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 22:17:17 +0000 (23:17 +0100)]
script: When lowering, avoid raising
It can happen that the z of the piece which sets the z_top for the end
of the plan (with z_bot == null) will cause the first lowered piece to
actually be raised.
This is particularly troublesome if the piece is an occulting one,
which the server will not allowe to be raised.
Handle this case specially: if necessary, set the z_top to top piece
of that plan entry.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 22:09:42 +0000 (23:09 +0100)]
api: Allow setz to strictly lower an occulter
This will be useful for various things, including in particular
recovering from things stuck under occulters, and making the UI "b"
work properly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:20:36 +0000 (01:20 +0100)]
script: Remove a redundant semicolon
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:09:49 +0000 (01:09 +0100)]
script: New "bottom" concept name replaces "pinned" for lowering
Currently the implementation is the same, so this is just a slightly
selective search and replace of "pinned" to "bottom".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:02:15 +0000 (01:02 +0100)]
script: Consistently use lower_treat_pinned
PieceInfo.pinned is not the same, and the algorithm needs a coherent
idea of what counts.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:03:20 +0000 (01:03 +0100)]
promote and rename lower_treat_pinned
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 13 Jun 2021 14:24:57 +0000 (15:24 +0100)]
tera: Drop direct dependency on tera
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 13 Jun 2021 14:23:34 +0000 (15:23 +0100)]
tera: Make nwtemplates use tera_standalone
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:25:50 +0000 (18:25 +0100)]
CHANGELOG: Document changes in 0.7.1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:20:57 +0000 (18:20 +0100)]
cargo deps: Update to usvg 0.14 and adjust all command lines
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:04:49 +0000 (18:04 +0100)]
cargo deps: Update to nix 0.21
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:02:33 +0000 (18:02 +0100)]
cargo deps: Update to strum 0.21
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:53:51 +0000 (17:53 +0100)]
docs: build.rst: Document tested version of Nightly Rust, actually
IDK why the dates disagree, but they do.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:50:14 +0000 (17:50 +0100)]
docs: build.rst: Document tested version of Nightly Rust
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:49:54 +0000 (17:49 +0100)]
make-release: Add compiler compat to release checklist
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:49:37 +0000 (17:49 +0100)]
Cargo.toml: Update all versions to 0.7.1
Commit made automatically by update-versions.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:47:46 +0000 (17:47 +0100)]
docs: build.rst: Section for how to build just the cli
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:44:52 +0000 (17:44 +0100)]
docs: build.rst: Mention that you don't need wdriver for just cli
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>