Mesa (main): util: Convert rb_tree_test to gtest
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 21 05:16:18 UTC 2021
Module: Mesa
Branch: main
Commit: 83449f61ba369b94def3b1c1232a7879fec200c0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83449f61ba369b94def3b1c1232a7879fec200c0
Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date: Tue Oct 19 09:19:27 2021 -0700
util: Convert rb_tree_test to gtest
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Acked-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13425>
---
src/util/meson.build | 13 +------------
src/util/rb_tree.h | 8 ++++++++
src/util/{rb_tree_test.c => rb_tree_test.cpp} | 4 ++--
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/util/meson.build b/src/util/meson.build
index ea6f342a401..ed1921f320f 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -294,18 +294,6 @@ if with_tests
)
endif
- test(
- 'rb_tree',
- executable(
- 'rb_tree_test',
- files('rb_tree_test.c'),
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
- dependencies : idep_mesautil,
- c_args : [c_msvc_compat_args],
- ),
- suite : ['util'],
- )
-
test(
'roundeven',
executable(
@@ -322,6 +310,7 @@ if with_tests
files_util_tests = files(
'bitset_test.cpp',
'blob_test.cpp',
+ 'rb_tree_test.cpp',
'register_allocate_test.cpp',
'tests/dag_test.cpp',
'tests/fast_idiv_by_const_test.cpp',
diff --git a/src/util/rb_tree.h b/src/util/rb_tree.h
index 8b354c091f5..37d969a8057 100644
--- a/src/util/rb_tree.h
+++ b/src/util/rb_tree.h
@@ -28,6 +28,10 @@
#include <stdint.h>
#include <stdlib.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/** A red-black tree node
*
* This struct represents a node in the red-black tree. This struct should
@@ -311,4 +315,8 @@ struct rb_node *rb_node_prev(struct rb_node *node);
*/
void rb_tree_validate(struct rb_tree *T);
+#ifdef __cplusplus
+} /* extern C */
+#endif
+
#endif /* RB_TREE_H */
diff --git a/src/util/rb_tree_test.c b/src/util/rb_tree_test.cpp
similarity index 99%
rename from src/util/rb_tree_test.c
rename to src/util/rb_tree_test.cpp
index 7551add95c1..5edbdd4792e 100644
--- a/src/util/rb_tree_test.c
+++ b/src/util/rb_tree_test.cpp
@@ -25,6 +25,7 @@
#include "rb_tree.h"
#include <assert.h>
+#include <gtest/gtest.h>
#include <limits.h>
/* A list of 100 random numbers from 1 to 100. The number 30 is explicitly
@@ -204,8 +205,7 @@ validate_search(struct rb_tree *tree, int first_number,
}
}
-int
-main()
+TEST(RBTreeTest, InsertAndSearch)
{
struct rb_test_node nodes[ARRAY_SIZE(test_numbers)];
struct rb_tree tree;
More information about the mesa-commit
mailing list