framework: fix deinitSession when using waiver xml
authorTapani Pälli <tapani.palli@intel.com>
Tue, 27 Oct 2020 10:27:37 +0000 (12:27 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Fri, 6 Nov 2020 09:28:20 +0000 (04:28 -0500)
commit17d50f2c22cf65f64ca62e7ae9167f151f1ac026
tree9e4132f163511019683d680ebaa2db0a643b9b8b
parentc70ffe9f2f79961b7589a379a4b113bb45c22693
framework: fix deinitSession when using waiver xml

Take numWaived in to account when considering if run was ok, patch also
add result.numWaived to the total number of tests, otherwise we hit
following assert when running with waiver:

cts-runner: glcTestRunner.cpp:829: Unknown function:
Assertion `result.numExecuted == result.numPassed + result.numFailed +
           result.numNotSupported + result.numWarnings' failed.

Components: Framework, OpenGL

VK-GL-CTS issue: 2631

Affects:
   cts-runner

Change-Id: Iac776fd1174e5461c455282cecca208f0322358d
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
external/openglcts/modules/runner/glcTestRunner.cpp