Update configs of tests

Author: zepinglee

.gitignore

@@ -5,7 +5,7 @@ ustcthesis-doc.pdf
 
 ## test files:
 build/
-test/**/*.pdf
+tests/**/*.pdf
 
 ## Core latex/pdflatex auxiliary files:
 *.aux

Makefile

@@ -29,7 +29,7 @@ test:
 	l3build check
 
 save:
-	bash test/save.sh
+	bash tests/save.sh
 
 clean : FORCE_MAKE
 	$(LATEXMK) -c $(MAIN).tex $(NAME)-doc.tex

build.lua

@@ -5,8 +5,8 @@
 
 module = "ustcthesis"
 
-testfiledir = "./test/testfiles"
-testsuppdir = "./test/support"
+testfiledir = "./tests/testfiles"
+testsuppdir = "./tests/support"
 
 demofiles = {"main.tex", "bib", "chapters"}
 installfiles = {"*.cls", "*.bst", "*.bbx", "*.cbx", "figures"}
@@ -18,10 +18,10 @@ stdengine = "xetex"
 
 checkconfigs = {
   "build",
-  "test/config-crossref",
-  "test/config-nomencl",
-  "test/config-bibtex",
-  "test/config-biblatex",
+  "tests/config-crossref",
+  "tests/config-nomencl",
+  "tests/config-bibtex",
+  "tests/config-biblatex",
 }
 
 typesetexe = "xelatex"
@@ -30,8 +30,6 @@ unpackexe = "xetex"
 checkopts = "-file-line-error -halt-on-error -interaction=nonstopmode"
 typesetopts = "-file-line-error -halt-on-error -interaction=nonstopmode"
 
-lvtext = ".tex"
-
 local package_repository = "https://github.com/ustctug/ustcthesis"
 local version_pattern = "[%d.]+[%l%d.-]*"
 

tests/config-biblatex.lua

@@ -1,4 +1,4 @@
-testfiledir = "./test/testfiles-biblatex"
+testfiledir = "./tests/testfiles-biblatex"
 
 checkruns = 3
 

tests/config-bibtex.lua

@@ -1,4 +1,4 @@
-testfiledir = "./test/testfiles-bibtex"
+testfiledir = "./tests/testfiles-bibtex"
 
 checkruns = 3
 

tests/config-crossref.lua

@@ -1,3 +1,3 @@
-testfiledir = "./test/testfiles-crossref"
+testfiledir = "./tests/testfiles-crossref"
 
 checkruns = 2

tests/config-nomencl.lua

@@ -1,4 +1,4 @@
-testfiledir = "./test/testfiles-nomencl"
+testfiledir = "./tests/testfiles-nomencl"
 
 checkruns = 2
 

tests/save.sh

@@ -2,16 +2,16 @@ save_file () {
     test="$1";
     for config in build crossref nomencl bibtex biblatex; do
         if [[ "$config" == "build" ]]; then
-            test_dir="test/testfiles";
+            test_dir="tests/testfiles";
         else
-            test_dir="test/testfiles-$config";
+            test_dir="tests/testfiles-$config";
         fi
-        file_path="$test_dir/$test.tex";
+        file_path="$test_dir/$test.lvt";
         if [ -f "$file_path" ]; then
             if [[ "$config" == "build" ]]; then
                 l3build save --halt-on-error "$test" || exit 1;
             else
-                l3build save --halt-on-error --config "test/config-$config" "$test" || exit 1;
+                l3build save --halt-on-error --config "tests/config-$config" "$test" || exit 1;
             fi
             break;
         fi
@@ -21,14 +21,14 @@ save_file () {
 save_config () {
     config="$1";
     if [[ "$config" == "build" ]]; then
-        for testfile in test/testfiles/*.tex; do
-            test="$(basename "$testfile" .tex)";
+        for testfile in tests/testfiles/*.lvt; do
+            test="$(basename "$testfile" .lvt)";
             l3build save --halt-on-error "$test" || exit 1;
         done
     else
-        for testfile in "test/testfiles-$config"/*.tex ; do
-            test="$(basename "$testfile" .tex)";
-            l3build save --halt-on-error --config "test/config-$config" "$test" || exit 1;
+        for testfile in "tests/testfiles-$config"/*.lvt ; do
+            test="$(basename "$testfile" .lvt)";
+            l3build save --halt-on-error --config "tests/config-$config" "$test" || exit 1;
         done
     fi
 }

tests/test.sh

@@ -1,21 +1,21 @@
-test="$(basename $1 .tex)";
-baseline_dir="test/baseline";
-diff_dir="test/diff";
+test="$(basename $1 .lvt)";
+baseline_dir="tests/baseline";
+diff_dir="tests/diff";
 baseline_path="$baseline_dir/$test.pdf";
 for config in build crossref nomencl bibtex biblatex; do
     if [[ "$config" == "build" ]]; then
-        test_dir="test/testfiles";
+        test_dir="tests/testfiles";
         build_dir="build/test";
     else
-        test_dir="test/testfiles-$config";
-        build_dir="build/test-test/config-$config";
+        test_dir="tests/testfiles-$config";
+        build_dir="build/test-tests/config-$config";
     fi
-    file_path="$test_dir/$test.tex";
+    file_path="$test_dir/$test.lvt";
     if [ -f "$file_path" ]; then
         if [[ "$config" == "build" ]]; then
             l3build save --halt-on-error "$test" || exit 1;
         else
-            l3build save --halt-on-error --config "test/config-$config" "$test" || exit 1;
+            l3build save --halt-on-error --config "tests/config-$config" "$test" || exit 1;
         fi
         output_path="$build_dir/$test.pdf";
         xdvipdfmx "$build_dir/$test.xdv" -o "$output_path";

tests/testfiles-bibtex/bibtex-numeric.tlg

@@ -683,7 +683,7 @@ Completed box being shipped out [1]
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 .\kern 722.98453
 .\kern 0.0
-(bibtex-numerical.bbl
+(bibtex-numeric.bbl
 Package fontspec Info: 
 (fontspec)             Font family 'FandolHei(0)' created for font 'FandolHei' with options [Extension={.otf},UprightFont={*-Regular},BoldFont={*-Bold}].
 (fontspec)