diff --git a/test/threads/hb-shape-threads.cc b/test/threads/hb-shape-threads.cc index 19b751b42..16959caf3 100644 --- a/test/threads/hb-shape-threads.cc +++ b/test/threads/hb-shape-threads.cc @@ -18,36 +18,34 @@ struct test_input_t { - const char *text_path; const char *font_path; + const char *text_path; bool is_variable; } default_tests[] = { - {"perf/texts/fa-thelittleprince.txt", - "perf/fonts/Amiri-Regular.ttf", + + {"perf/fonts/NotoNastaliqUrdu-Regular.ttf", + "perf/texts/fa-thelittleprince.txt", false}, - {"perf/texts/fa-thelittleprince.txt", - "perf/fonts/NotoNastaliqUrdu-Regular.ttf", + {"perf/fonts/Amiri-Regular.ttf", + "perf/texts/fa-thelittleprince.txt", false}, - {"perf/texts/en-thelittleprince.txt", - "perf/fonts/Roboto-Regular.ttf", + {"perf/fonts/Roboto-Regular.ttf", + "perf/texts/en-thelittleprince.txt", false}, - {"perf/texts/en-thelittleprince.txt", - SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", - true}, - - {"perf/texts/en-words.txt", - "perf/fonts/Roboto-Regular.ttf", + {"perf/fonts/Roboto-Regular.ttf", + "perf/texts/en-words.txt", false}, - {"perf/texts/en-words.txt", - SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", + {SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", + "perf/texts/en-thelittleprince.txt", true}, }; + static test_input_t *tests = default_tests; static unsigned num_tests = sizeof (default_tests) / sizeof (default_tests[0]); @@ -113,11 +111,11 @@ static void test_backend (backend_t backend, char name[1024] = "shape"; const char *p; strcat (name, "/"); - p = strrchr (test_input.text_path, '/'); - strcat (name, p ? p + 1 : test_input.text_path); - strcat (name, "/"); p = strrchr (test_input.font_path, '/'); strcat (name, p ? p + 1 : test_input.font_path); + strcat (name, "/"); + p = strrchr (test_input.text_path, '/'); + strcat (name, p ? p + 1 : test_input.text_path); strcat (name, variable ? "/var" : ""); strcat (name, "/"); strcat (name, backend_name);