tests/prime_self_import: further fix object counts
tests/prime_self_import: further fix object counts

A previous commit:

commit 2f2c491cf3167befe7c79e4b17afb4f6284dfc84
Author: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>
Date:   Fri Mar 28 10:52:46 2014 +0200

    lib/drmtest: don't dup quiescent fd

introduced a regression for drm object leak checking.  A following commit:

commit 8741c2289f17e9bcb740a01cad4764a71c918eea
Author: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>
Date:   Wed May 7 16:46:19 2014 +0300

    tests/gem_flink_race,prime_self_import: fix object counts

fixed the regression for some cases but missed the export-vs-gem_close-race
subtest.  Note that test behaviour depends on whether the subtest is run as
part of the whole prime_self_import test (fail), or as a single subtest (pass).
Using execlists on Gen8+ reverses the pass/fail due to lazy context allocation
which is presumably why this has now been noticed.

This commit applies the same fix to the export-vs-gem_close-race subtest.

Cc: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87627
Signed-off-by: Thomas Daniel <f031fe87014890daf59987e03350331e134ad7c5@intel.com>
Reviewed-by: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>
Signed-off-by: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>

yipdw/intel-gpu-tools,dlespiau/checkmate-test-igt,chenxianqin/intel-gpu-tools,tiagovignatti/intel-gpu-tools,dlespiau/checkmate-test-igt,chenxianqin/intel-gpu-tools,mv0/intel-gpu-tools,yipdw/intel-gpu-tools,chenxianqin/intel-gpu-tools,dlespiau/checkmate-test-igt,chenxianqin/intel-gpu-tools,mv0/intel-gpu-tools,dlespiau/checkmate-test-igt,mv0/intel-gpu-tools,yipdw/intel-gpu-tools,mv0/intel-gpu-tools,yipdw/intel-gpu-tools,tiagovignatti/intel-gpu-tools,tiagovignatti/intel-gpu-tools,tiagovignatti/intel-gpu-tools