aboutsummaryrefslogtreecommitdiffstats
path: root/tests/tests.c
diff options
context:
space:
mode:
authorDaniel Campello <campello@chromium.org>2022-03-29 20:47:46 -0600
committerAnastasia Klimchuk <aklm@chromium.org>2022-04-06 03:05:19 +0000
commit9454336970806b9b869ae1ee2515280051e60780 (patch)
tree1f50affa4a52c6044ccdad33965a420c74c8271c /tests/tests.c
parentbd2d070f9fb2c8d89276a9e17ae7e4db1356d26e (diff)
downloadflashrom-9454336970806b9b869ae1ee2515280051e60780.tar.gz
flashrom-9454336970806b9b869ae1ee2515280051e60780.tar.bz2
flashrom-9454336970806b9b869ae1ee2515280051e60780.zip
tests: use MOCK_FD instead of NON_ZERO
With this change the mocks are able to return a non-negative value for the file descriptor expected from open operations. This avoid issues with subsequent error checks of the form `if (fd < 0)` BUG=b:227404721 TEST=./test_build.sh; FEATURES=test emerge-amd64-generic flashrom BRANCH=none Signed-off-by: Daniel Campello <campello@chromium.org> Change-Id: Ib6bac051852aea2465665a6fd669b7f5e3772985 Reviewed-on: https://review.coreboot.org/c/flashrom/+/63193 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Nikolai Artemiev <nartemiev@google.com> Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Diffstat (limited to 'tests/tests.c')
-rw-r--r--tests/tests.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/tests.c b/tests/tests.c
index 33b2ea20..f32c14da 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -79,7 +79,7 @@ int __wrap_open(const char *pathname, int flags)
LOG_ME;
if (get_io() && get_io()->open)
return get_io()->open(get_io()->state, pathname, flags);
- return NON_ZERO;
+ return MOCK_FD;
}
int __wrap_open64(const char *pathname, int flags)
@@ -87,7 +87,7 @@ int __wrap_open64(const char *pathname, int flags)
LOG_ME;
if (get_io() && get_io()->open)
return get_io()->open(get_io()->state, pathname, flags);
- return NON_ZERO;
+ return MOCK_FD;
}
int __wrap___open64_2(const char *pathname, int flags)
@@ -95,7 +95,7 @@ int __wrap___open64_2(const char *pathname, int flags)
LOG_ME;
if (get_io() && get_io()->open)
return get_io()->open(get_io()->state, pathname, flags);
- return NON_ZERO;
+ return MOCK_FD;
}
int __wrap_ioctl(int fd, unsigned long int request, ...)