Skip to content

Commit

Permalink
Tests: Don't enable HW accel as side-effect (#557)
Browse files Browse the repository at this point in the history
The Settings test attempts to test the class by changing settings
variables and reading them back again. Problem is, that affects
the REST of the unit tests. So instead of enabling HW accel and
causing crashes, we'll diddle something innocuous, like OMP_THREADS.
  • Loading branch information
ferdnyc committed Aug 21, 2020
1 parent d121f9d commit f71051e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/Settings_Tests.cpp
Expand Up @@ -41,7 +41,7 @@ TEST(Settings_Default_Constructor)
// Create an empty color
Settings *s = Settings::Instance();

CHECK_EQUAL(0, s->HARDWARE_DECODER);
CHECK_EQUAL(12, s->OMP_THREADS);
CHECK_EQUAL(false, s->HIGH_QUALITY_SCALING);
CHECK_EQUAL(false, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
}
Expand All @@ -50,15 +50,15 @@ TEST(Settings_Change_Settings)
{
// Create an empty color
Settings *s = Settings::Instance();
s->HARDWARE_DECODER = 1;
s->OMP_THREADS = 8;
s->HIGH_QUALITY_SCALING = true;
s->WAIT_FOR_VIDEO_PROCESSING_TASK = true;

CHECK_EQUAL(1, s->HARDWARE_DECODER);
CHECK_EQUAL(8, s->OMP_THREADS);
CHECK_EQUAL(true, s->HIGH_QUALITY_SCALING);
CHECK_EQUAL(true, s->WAIT_FOR_VIDEO_PROCESSING_TASK);

CHECK_EQUAL(1, s->HARDWARE_DECODER);
CHECK_EQUAL(8, Settings::Instance()->OMP_THREADS);
CHECK_EQUAL(true, Settings::Instance()->HIGH_QUALITY_SCALING);
CHECK_EQUAL(true, Settings::Instance()->WAIT_FOR_VIDEO_PROCESSING_TASK);
}

0 comments on commit f71051e

Please sign in to comment.