Allow marking tests as being hardware only.

Annotate the relevant tests.

Fixes #626
Fixes #627

Author: SiegeLordEx

tests/test_compressed.ini

@@ -1,4 +1,7 @@
+# All of these are hardware only as compressed bitmaps are a video-bitmap only feature.
+
 [loading]
+hw_only = true
 op0=b = al_load_bitmap(filename)
 op1=al_draw_bitmap(b, 0, 0, 0)
 
@@ -18,6 +21,7 @@ filename = ../examples/data/mysha_dxt5.dds
 sig=ftZE50000um0050000jLL050000222200000000000000000000000000000000000000000000000000
 
 [dest rw]
+hw_only = true
 op0=b = al_load_bitmap(filename)
 op1=al_set_target_bitmap(b)
 # Need to lock, otherwise the triangles of the rectangle will lock separately and result in diagonal artifacts
@@ -43,6 +47,7 @@ filename = ../examples/data/mysha_dxt5.dds
 sig=ggZE50000gg0050000jLL050000222200000000000000000000000000000000000000000000000000
 
 [dest wo]
+hw_only = true
 filename2 = ../examples/data/blue_box.png
 op0=b = al_load_bitmap(filename)
 op1=b2 = al_load_bitmap(filename2)
@@ -67,6 +72,7 @@ filename = ../examples/data/mysha_dxt5.dds
 sig=OOZD50000OO0050000aML050000222200000000000000000000000000000000000000000000000000
 
 [src]
+hw_only = true
 filename2 = ../examples/data/fakeamp.bmp
 op0=b = al_load_bitmap(filename)
 op1=b2 = al_load_bitmap(filename2)
@@ -93,6 +99,7 @@ filename = ../examples/data/mysha_dxt5.dds
 sig=ftwu00000um0w00000QB0r00000vrnv00000000000000000000000000000000000000000000000000
 
 [dest sub]
+hw_only = true
 op0=b = al_load_bitmap(filename)
 op1=b2 = al_create_sub_bitmap(b, 16, 16, 128, 128);
 op2=al_set_target_bitmap(b2)
@@ -116,6 +123,7 @@ filename = ../examples/data/mysha_dxt5.dds
 sig=LLZD50000LL0050000ZLL050000222200000000000000000000000000000000000000000000000000
 
 [convert from]
+hw_only = true
 op0=b = al_load_bitmap(filename)
 op1=al_set_new_bitmap_format(ALLEGRO_PIXEL_FORMAT_RGB_565)
 op2=al_convert_bitmap(b)
@@ -137,6 +145,7 @@ filename = ../examples/data/mysha_dxt5.dds
 sig=ftZD50000um0050000jLL050000222200000000000000000000000000000000000000000000000000
 
 [convert to]
+hw_only = true
 filename = ../examples/data/blue_box.png
 op0=al_set_new_bitmap_format(ALLEGRO_PIXEL_FORMAT_RGB_565)
 op1=b = al_load_bitmap(filename)

tests/test_convert.ini

@@ -1,4 +1,6 @@
 [test convert]
+# This test relies on needing a video bitmap.
+hw_only = true
 op0= al_clear_to_color(#554321)
 op1= al_set_new_bitmap_flags(ALLEGRO_MEMORY_BITMAP)
 op2= al_set_new_bitmap_format(ALLEGRO_PIXEL_FORMAT_RGB_565)

tests/test_driver.c

@@ -70,6 +70,7 @@ int               verbose = 0;
 int               total_tests = 0;
 int               passed_tests = 0;
 int               failed_tests = 0;
+int               skipped_tests = 0;
 
 #define streq(a, b)  (0 == strcmp((a), (b)))
 
@@ -932,7 +933,7 @@ static void check_similarity(ALLEGRO_CONFIG const *cfg,
 }
 
 static void do_test(ALLEGRO_CONFIG *cfg, char const *testname,
-   ALLEGRO_BITMAP *target, int bmp_type, bool reliable)
+   ALLEGRO_BITMAP *target, int bmp_type, bool reliable, bool do_check_hash)
 {
 #define MAXBUF    80
 
@@ -1484,12 +1485,10 @@ static void do_test(ALLEGRO_CONFIG *cfg, char const *testname,
 
    al_set_new_bitmap_format(ALLEGRO_PIXEL_FORMAT_ANY_WITH_ALPHA);
 
-   if (bmp_type == SW) {
-      al_set_new_bitmap_flags(ALLEGRO_MEMORY_BITMAP);
+   if (do_check_hash) {
       check_hash(cfg, testname, target, bmp_type);
    }
    else {
-      al_set_new_bitmap_flags(ALLEGRO_VIDEO_BITMAP);
       check_similarity(cfg, testname, target, membuf, bmp_type, reliable);
    }
 
@@ -1538,15 +1537,23 @@ static void sw_hw_test(ALLEGRO_CONFIG *cfg, char const *testname)
 {
    int old_failed_tests = failed_tests;
    bool reliable;
+   char const *hw_only_str = al_get_config_value(cfg, testname, "hw_only");
+   bool hw_only = hw_only_str && get_bool(hw_only_str);
 
    al_set_new_bitmap_flags(ALLEGRO_MEMORY_BITMAP);
-   do_test(cfg, testname, membuf, SW, true);
+   if (!hw_only) {
+      do_test(cfg, testname, membuf, SW, true, true);
+   }
 
    reliable = (failed_tests == old_failed_tests);
 
    if (display) {
       al_set_new_bitmap_flags(ALLEGRO_VIDEO_BITMAP);
-      do_test(cfg, testname, al_get_backbuffer(display), HW, reliable);
+      do_test(cfg, testname, al_get_backbuffer(display), HW, reliable, hw_only);
+   } else if (hw_only) {
+      printf("WARNING: Skipping hardware-only test due to the --no-display flag: %s\n",
+             testname);
+      skipped_tests++;
    }
 }
 
@@ -1811,6 +1818,7 @@ int main(int _argc, char *_argv[])
    printf("total tests:  %d\n", total_tests);
    printf("passed tests: %d\n", passed_tests);
    printf("failed tests: %d\n", failed_tests);
+   printf("skipped tests: %d\n", skipped_tests);
    printf("\n");
 
    return !!failed_tests;

tests/test_prim2.ini

@@ -1,22 +1,22 @@
 # Test primitives which are only in the 5.1 branch.
 
 [test projection]
+# Projection doesn't work on memory bitmaps
+hw_only = true
 op0=al_orthographic_transform(trans, -1, -1, -1, 1, 1, 1)
 op1=al_use_projection_transform(trans)
 op2=al_draw_filled_circle(0, 0, 1, #aa6600)
-# Projection doesn't work on memory bitmaps
-hash=35af6375
-hash_hw=cb2630a9
-sig_hw=0DMMMMMC0CMMMMMMM9MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM9MMMMMMM60AMMMMM80
+hash=cb2630a9
+sig=0DMMMMMC0CMMMMMMM9MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM9MMMMMMM60AMMMMM80
 
 [test projection flipped]
+# Projection doesn't work on memory bitmaps
+hw_only = true
 op0=al_orthographic_transform(trans, -1, 1, -1, 1, -1, 1)
 op1=al_use_projection_transform(trans)
 op2=al_draw_filled_circle(0, 0, 1, #aa6600)
-# Projection doesn't work on memory bitmaps
-hash=35af6375
-hash_hw=65feb169
-sig_hw=0DMMMMMC0CMMMMMMM9MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM9MMMMMMM60AMMMMM80
+hash=cb2630a9
+sig=0DMMMMMC0CMMMMMMM9MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM9MMMMMMM60AMMMMM80
 
 [triangle base]
 op0=al_clear_to_color(white)