diff options
author | Marius Bakke <[email protected]> | 2020-01-07 17:43:20 +0100 |
---|---|---|
committer | Marius Bakke <[email protected]> | 2020-01-07 17:43:20 +0100 |
commit | 6d15516dc6ffca3622ff49179c5c7c360c11b54b (patch) | |
tree | d235b60e0605fd3aace9c3357a20658dac3e3d85 /gnu/packages/patches/mesa-timespec-test-32bit.patch | |
parent | 0ed75a5f068541339bc1db6271796a3d382bb681 (diff) | |
parent | 982eff9e841f3539e4ecf93669435a290bfde571 (diff) |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/patches/mesa-timespec-test-32bit.patch')
-rw-r--r-- | gnu/packages/patches/mesa-timespec-test-32bit.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/gnu/packages/patches/mesa-timespec-test-32bit.patch b/gnu/packages/patches/mesa-timespec-test-32bit.patch deleted file mode 100644 index 3e4890f3a4..0000000000 --- a/gnu/packages/patches/mesa-timespec-test-32bit.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix a test failure on 32-bit systems. - -Taken from upstream: -https://gitlab.freedesktop.org/mesa/mesa/commit/dd1dba80b9ee74ec8b90761285a8262e374bf8ef - -diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec/timespec_test.cpp ---- a/src/util/tests/timespec/timespec_test.cpp -+++ b/src/util/tests/timespec/timespec_test.cpp -@@ -206,7 +206,7 @@ TEST(timespec_test, timespec_from_nsec) - - timespec_from_nsec(&a, UINT64_MAX); - EXPECT_EQ(a.tv_nsec, UINT64_MAX % NSEC_PER_SEC); -- EXPECT_EQ(a.tv_sec, UINT64_MAX / NSEC_PER_SEC); -+ EXPECT_EQ(a.tv_sec, (time_t)(UINT64_MAX / NSEC_PER_SEC)); - } - - TEST(timespec_test, timespec_from_usec) |