Merge branch 'master' into interrupt_test

diff --cc tests/scryer/issues.rs
index 95208a4c68a3b4678f99ff7b312a36f153c2f928,52a2b4fc2c3dd49c6da1efa75ccb2e65ba5b5531..038a5ec91542d15a7cf17834f39a7e864b92d490
--- 1/tests/scryer/issues.rs
--- 2/tests/scryer/issues.rs
+++ b/tests/scryer/issues.rs
@@@ -172,14 -174,17 +172,27 @@@ async fn http_open_hanging() 
      );
  }
  
 +#[tokio::test(flavor = "multi_thread")]
 +#[cfg(feature = "repl")]
 +#[cfg(unix)]
 +#[cfg_attr(miri, ignore = "it takes too long to run")]
 +async fn sigint_interrupts_nonterminating_goals() {
 +    load_module_test_with_input(
 +        "tests-pl/issue-interrupt-nontermination.pl",
 +        format!("PROLOG={:?}.", env!("CARGO_BIN_EXE_scryer-prolog")),
 +        "ok\n",
 +    );
+ #[test]
+ #[cfg_attr(miri, ignore = "it takes too long to run")]
+ #[cfg_attr(
+     all(
+         target_arch = "x86",
+         target_os = "linux",
+         target_vendor = "unknown",
+         target_env = "gnu"
+     ),
+     ignore = "FIXME was already broken before d50d42509903dc3cc1841eb757a703753de84754"
+ )]
+ fn discussion3359() {
+     load_module_test("tests-pl/discussion3359.pl", "");
  }