Update to upstream 1.13.0

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Reviewed-by: Maria Sfiraiala <maria.sfiraiala@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #2

diff --git a/Config.uk b/Config.uk
index 862d4ee18c6c8c04ece63f8e17cdad5a45018733..b861a39ea3b8c41edad0e84b9debc209541f2471 100644 (file)
--- a/Config.uk
+++ b/Config.uk
@@ -1,10 +1,14 @@
 menuconfig LIBGOOGLETEST
-    bool "Google Testing and Mocking Framework"
+    bool "googletest - Google's C++ testing and mocking framework"
     select LIBCXX
     default n
 
 if LIBGOOGLETEST
     config LIBGOOGLETEST_BUILD_MAIN
-    bool "Build googletest with main"
+    bool "Build the googletest main function"
     default n
+    help
+        Tests written for googletest may omit a main function, instead relying
+        on one provided in the googletest library itself. This option selects
+        whether to include the main function in the build.
 endif

diff --git a/Makefile.uk b/Makefile.uk
index 477784e65347181de68a943e7cdd1360409d44e8..bc4d6afab23bed2e45fc801bb33004f25bd8c094 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -1,8 +1,10 @@
 #  libgoogletest Makefile.uk
 #
 #  Authors: Vlad-Andrei Badoiu <vlad_andrei.badoiu@stud.acs.upb.ro>
+#           Andrei Tatar <andrei@unikraft.io>
 #
 #  Copyright (c) 2019, Politehnica University of Bucharest. All rights reserved.
+#  Copyright (c) 2023, Unikraft GmbH and The Unikraft Authors.
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions
@@ -38,31 +40,25 @@ $(eval $(call addlib_s,libgoogletest,$(CONFIG_LIBGOOGLETEST)))
 ################################################################################
 # Sources
 ################################################################################
-LIBGOOGLETEST_VERSION=1.8.1
-LIBGOOGLETEST_URL=https://github.com/google/googletest/archive/release-$(LIBGOOGLETEST_VERSION).zip
+LIBGOOGLETEST_VERSION=1.13.0
+LIBGOOGLETEST_URL=https://github.com/google/googletest/archive/refs/tags/v$(LIBGOOGLETEST_VERSION).tar.gz
 $(eval $(call fetch,libgoogletest,$(LIBGOOGLETEST_URL)))
 
 ################################################################################
 # Helpers
 ################################################################################
-LIBGOOGLETEST_SUBDIR=googletest-release-$(LIBGOOGLETEST_VERSION)
-LIBGOOGLETEST_SRC = $(LIBGOOGLETEST_ORIGIN)/$(LIBGOOGLETEST_SUBDIR)
+LIBGOOGLETEST_SRC = $(LIBGOOGLETEST_ORIGIN)/googletest-$(LIBGOOGLETEST_VERSION)
 
 ################################################################################
 # Library includes
 ################################################################################
-CINCLUDES-$(CONFIG_LIBGOOGLETEST) += -I$(LIBGOOGLETEST_SRC)/googletest/
-CINCLUDES-$(CONFIG_LIBGOOGLETEST) += -I$(LIBGOOGLETEST_SRC)/googletest/include
-
-CXXINCLUDES-$(CONFIG_LIBGOOGLETEST) += -I$(LIBGOOGLETEST_SRC)/googletest/
 CXXINCLUDES-$(CONFIG_LIBGOOGLETEST) += -I$(LIBGOOGLETEST_SRC)/googletest/include
+CXXINCLUDES-$(CONFIG_LIBGOOGLETEST) += -I$(LIBGOOGLETEST_SRC)/googletest/
 
 ################################################################################
 # Global flags
 ################################################################################
-CONFIG_FLAGS += -D GTEST_HAS_CXXABI_H_ -D GTEST_LANG_CXX11
-LIBGOOGLETEST_CFLAGS-y         += $(CONFIG_FLAGS)
-LIBGOOGLETEST_CXXFLAGS-y       += $(CONFIG_FLAGS)
+LIBGOOGLETEST_CXXFLAGS-y += -DGTEST_HAS_CXXABI_H_
 
 ################################################################################
 # Library sources