diff --git a/.DS_Store b/.DS_Store
index 4b65ed6a2..c279271a4 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/tests/html/.DS_Store b/tests/html/.DS_Store
index d2b7c7046..94b74a6ee 100644
Binary files a/tests/html/.DS_Store and b/tests/html/.DS_Store differ
diff --git a/tests/html/source/.DS_Store b/tests/html/source/.DS_Store
index e946f9b8a..5622a87a0 100644
Binary files a/tests/html/source/.DS_Store and b/tests/html/source/.DS_Store differ
diff --git a/tests/html/source/scripts/top.js b/tests/html/source/scripts/top.js
index dc9c9772c..a308f7fbd 100644
--- a/tests/html/source/scripts/top.js
+++ b/tests/html/source/scripts/top.js
@@ -1,12 +1,14 @@
// If any value in the 'select' list(s) changes, the corresponding
// HTML document is loaded in frame_1.
function change() {
- var dpi = document.getElementById('dpi').value;
- var font = document.getElementById('font').value;
- var mode = document.getElementById('mode').value;
- var size = document.getElementById('size').value;
- var frame = document.getElementById('frame_1');
- var string = "pages/"+dpi+"/"+font+"/"+mode+"/"+size+"/index.html";
+ var dpi = document.getElementById('dpi').value;
+ var font = document.getElementById('font').value;
+ var mode = document.getElementById('mode').value;
+ var size = document.getElementById('size').value;
+ var frame = document.getElementById('frame_1');
+ var font_type = font.substring(font.indexOf('.')+1) // Font file extension
+ var font_name = font.split('.')[0] // Font name without extension
+ var string = "pages/"+dpi+"/"+font_type+"/"+font_name+"/"+mode+"/"+size+"/index.html";
frame.src = string;
}
// Function to sort the columns of the table when you click on the header
@@ -113,6 +115,6 @@ function topFunction() {
}
// Function to pause/play the animation
function pause_play() {
- var div = frame_2.document.getElementById('animation');
- div.classList.toggle('pause');
+ var div = frame_2.document.getElementById('animation');
+ div.classList.toggle('pause');
}
\ No newline at end of file
diff --git a/tests/runme.sh b/tests/runme.sh
index 6b4e35980..22d660382 100755
--- a/tests/runme.sh
+++ b/tests/runme.sh
@@ -21,78 +21,83 @@ touch ./html/top.html
# Generating top.html file
echo "
-
- FreeType Test Framework
-
-
-
-
-
-
-
Base Version: $FT_TEST_BASE_DLL
- Test Version: $FT_TEST_TEST_DLL
-
Base Version: $FT_TEST_BASE_DLL
+Test Version: $FT_TEST_TEST_DLL
+
+
+
+">./html/top.html
#####################################################################
# Filling html/top.html file with links to all the index.html files.
+x="";
+y="";
for i in $FT_TEST_DPI; do
- mkdir ./html/pages/$i
- for j in $FT_TEST_FONT_FILE; do
- mkdir ./html/pages/$i/$j
- for k in $FT_TEST_RENDER_MODE; do
- mkdir ./html/pages/$i/$j/$k
- for l in $FT_TEST_PT_SIZE; do
- mkdir ./html/pages/$i/$j/$k/$l
- mkdir ./html/pages/$i/$j/$k/$l/images
- ./tests $FT_TEST_BASE_DLL $FT_TEST_TEST_DLL $j $l $k $i
- done
- done
- done
+mkdir ./html/pages/$i
+for j in $FT_TEST_FONT_FILE; do
+eval x="$( cut -d '.' -f 2- <<< "$j" )"; #Font file type / extension
+eval y="$( cut -d '.' -f 1 <<< "$j" )"; #Font file name
+mkdir ./html/pages/$i/$x
+mkdir ./html/pages/$i/$x/$y
+for k in $FT_TEST_RENDER_MODE; do
+mkdir ./html/pages/$i/$x/$y/$k
+for l in $FT_TEST_PT_SIZE; do
+mkdir ./html/pages/$i/$x/$y/$k/$l
+mkdir ./html/pages/$i/$x/$y/$k/$l/images
+./tests $FT_TEST_BASE_DLL $FT_TEST_TEST_DLL $j $l $k $i
+done
+done
+done
done
#####################################################################
# Buttons for animation selection
echo '