From bee3d5d7470d8efab36bfcc8bcaa2697633fd4e8 Mon Sep 17 00:00:00 2001 From: Noah Hellman Date: Mon, 10 Apr 2023 11:29:40 +0200 Subject: [PATCH] bench/suite_bench: use snake case for input files rust identifiers may not contain - use _ for files also to avoid confusion of having two names --- Makefile | 6 ++++-- bench/{inline-attrs.dj => inline_attrs.dj} | 0 bench/input/build.rs | 3 +-- tests/bench/Makefile | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename bench/{inline-attrs.dj => inline_attrs.dj} (100%) diff --git a/Makefile b/Makefile index 0ee01a7..884bd1c 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,8 @@ suite: suite_bench: git submodule update --init modules/djot.js for f in $$(find modules/djot.js/bench -name '*.dj' | xargs basename -a); do \ - ln -fs ../../modules/djot.js/bench/$$f tests/bench/$$f; \ + dst=$$(echo $$f | sed 's/-/_/g'); \ + ln -fs ../../modules/djot.js/bench/$$f tests/bench/$$dst; \ done (cd tests/bench && make) cargo test --features suite_bench bench:: @@ -47,7 +48,8 @@ suite_bench: bench: git submodule update --init modules/djot.js for f in $$(find modules/djot.js/bench -name '*.dj' | xargs basename -a); do \ - ln -fs ../modules/djot.js/bench/$$f bench/$$f; \ + dst=$$(echo $$f | sed 's/-/_/g'); \ + ln -fs ../modules/djot.js/bench/$$f bench/$$dst; \ done cov: suite suite_bench diff --git a/bench/inline-attrs.dj b/bench/inline_attrs.dj similarity index 100% rename from bench/inline-attrs.dj rename to bench/inline_attrs.dj diff --git a/bench/input/build.rs b/bench/input/build.rs index 8b0f3b1..f2fdf5f 100644 --- a/bench/input/build.rs +++ b/bench/input/build.rs @@ -8,12 +8,11 @@ fn main() { if let Some(name) = entry.file_name().to_str() { if let Some(name) = name.strip_suffix(".dj") { if entry.file_type().map_or(false, |ty| !ty.is_dir()) { - let name_snake = name.replace('-', "_"); let input = std::fs::read_to_string( std::path::Path::new("..").join(entry.file_name()), ) .ok()?; - return Some((name_snake, input)); + return Some((name.to_string(), input)); } } } diff --git a/tests/bench/Makefile b/tests/bench/Makefile index ebd4893..b84439c 100644 --- a/tests/bench/Makefile +++ b/tests/bench/Makefile @@ -9,7 +9,7 @@ DJOT_JS_SRC=$(shell find ${DJOT_JS}/src -name '.ts') mod.rs: ${TEST_DJ} html echo "use crate::suite_test;" > $@ for name in ${TEST}; do \ - name_snake=$$(basename -a $$name | sed 's/-/_/g'); \ + name_snake=$$(basename -a $$name); \ skip_reason=$$(grep -E "^$${name_snake}:" skip | cut -d: -f2); \ [ -n "$$skip_reason" ] && echo "#[ignore = \"$${skip_reason}\"]"; \ echo "#[test]"; \