Skip to content

Commit

Permalink
Make tests compatible with wasi
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsuhiko committed Jan 6, 2023
1 parent 7add09b commit 6ddfbf5
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[target.wasm32-wasi]
runner = ["./scripts/wasmtime-wrapper.sh"]
2 changes: 1 addition & 1 deletion minijinja/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ memo-map = { version = "0.3.1", optional = true }
unicode-ident = { version = "1.0.5", optional = true }

[dev-dependencies]
insta = { version = "1.19.0", features = ["glob", "serde"] }
insta = { version = "1.26.0", features = ["glob", "serde"] }
serde_json = "1.0.68"
similar-asserts = "1.4.2"
3 changes: 0 additions & 3 deletions minijinja/src/compiler/instructions.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#[cfg(feature = "internal_debug")]
use std::fmt;

#[cfg(test)]
use similar_asserts::assert_eq;

use crate::compiler::tokens::Span;
use crate::output::CaptureMode;
use crate::value::Value;
Expand Down
16 changes: 7 additions & 9 deletions minijinja/tests/test_templates.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::BTreeMap;
use std::fmt::Write;
use std::fs;
use std::{env, fs};

use minijinja::value::{StructObject, Value};
use minijinja::{context, Environment, Error, State};
Expand All @@ -10,16 +10,14 @@ use similar_asserts::assert_eq;
#[test]
fn test_vm() {
let mut refs = Vec::new();
for entry in fs::read_dir("tests/inputs/refs").unwrap() {
let entry = entry.unwrap();
let filename = entry.file_name();
insta::glob!("inputs/refs/*", |entry| {
let filename = entry.file_name().unwrap();
let filename = filename.to_str().unwrap();
if !filename.ends_with(".txt") && !filename.ends_with(".html") {
continue;
if filename.ends_with(".txt") || filename.ends_with(".html") {
let source = fs::read_to_string(entry).unwrap();
refs.push((entry.to_path_buf(), source));
}
let source = fs::read_to_string(entry.path()).unwrap();
refs.push((entry.path().clone(), source));
}
});

insta::glob!("inputs/*", |path| {
if !path.metadata().unwrap().is_file() {
Expand Down
4 changes: 4 additions & 0 deletions scripts/wasmtime-wrapper.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $SCRIPT_DIR/..
wasmtime run --env INSTA_WORKSPACE_ROOT=/ --mapdir "/::$(pwd)" -- "$@"

0 comments on commit 6ddfbf5

Please sign in to comment.