Merge commit 'b19a54d2f9d8a3e83366c638aace4cf3b5daa96e' as 'build/dobuild'

build/dobuild/examples/cmake-gtest-example/CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(cmake-gtest-example VERSION 0.0.1 DESCRIPTION "CMake gtest example")
+
+option(THREADS_PREFER_PTHREAD_FLAG "If the use of the -pthread compiler and linker flag is prefered then the caller can set" ON)
+option(POSITION_INDEPENDENT_CODE "This variable is used to initialize the POSITION_INDEPENDENT_CODE property on all the targets" ON)
+
+find_package(PkgConfig REQUIRED)
+find_package(Threads REQUIRED)
+
+pkg_check_modules(GTEST gtest_main gtest)
+
+include(CTest)
+include(GoogleTest)
+
+add_executable(alltests
+  test_stringcompare.cpp
+)
+
+target_include_directories(alltests PUBLIC ${GTEST_INCLUDE_DIRS})
+target_compile_options(alltests PUBLIC -Wall -Wextra ${GTEST_CFLAGS})
+target_link_libraries(alltests PUBLIC Threads::Threads ${GTEST_LIBRARIES} gtest_main)
+
+enable_testing()
+gtest_discover_tests(alltests TEST_PREFIX alltests:)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
+add_dependencies(check alltests)
+
+add_custom_target(memcheck COMMAND ${CMAKE_CTEST_COMMAND} -T memcheck)
+add_dependencies(memcheck alltests)

build/dobuild/examples/cmake-gtest-example/Makefile

@@ -0,0 +1,94 @@
+SHELL := /bin/sh
+MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+MAKEFLAGS += --no-builtin-rules
+
+.SUFFIXES:
+
+.PHONY: default
+default: all
+
+#######################################################################################################################
+# Overridable project defaults
+
+DOBUILD_TOPDIR ?= $(DOBUILDDIR)
+DOBUILD_PROJECTDIR ?= $(patsubst %/,%,$(dir $(MAKEFILE)))
+DOBUILD_DOCKERFILE ?= $(PROJECTDIR)/%ID%.dockerfile
+
+PROJECTDIR = $(DOBUILD_PROJECTDIR)
+DOBUILDDIR ?= $(PROJECTDIR)/../..
+
+include $(DOBUILDDIR)/defaults.mk
+
+#######################################################################################################################
+# Project defaults and macros
+
+DEFAULTTARGET = x86_64-ubuntu@bionic+builder@debug
+
+FETCHDIR = $(BUILDDIR)/.deps
+
+#######################################################################################################################
+# Project dependencies
+
+GTEST_VERSION = 1.8.1
+IMAGE_BUILDARGS += GTEST_VERSION=$(GTEST_VERSION)
+IMAGE_BUILDARGS += GTEST_MTIME=$(call mtime,$(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz)
+FETCH_TARGETS += $(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz
+$(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz: URL := https://github.com/google/googletest/archive/release-$(GTEST_VERSION).tar.gz
+$(SKIP_MD5SUM)$(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz: MD5 := 2e6fbeb6a91310a16efe181886c59596
+
+#######################################################################################################################
+# Architecture-specific rule target configuration
+
+CMAKE_TARGETS += $(call target_properties_combine,\
+    ,\
+    x86_64 arm32v7,\
+    ubuntu@bionic alpine@3.10,\
+    ,\
+    ,\
+    builder,\
+    ,\
+    debug release \
+  )
+DOCKER_TARGETS += $(CMAKE_TARGETS)
+
+#######################################################################################################################
+# Common rule target configuration
+
+CURLFLAGS += -s
+
+DOCKER_RUNFLAGS += --cap-add SYS_PTRACE
+DOCKER_RUNFLAGS += --security-opt seccomp=unconfined
+
+OUTDIRS += $(OUTDIR)/src
+
+EXTRACT_TARGETS += $(patsubst $(FETCHDIR)/%.tar.gz,$(OUTDIR)/src/%,$(FETCH_TARGETS))
+
+#######################################################################################################################
+# Makefile dependencies
+
+MAKEFILE_DEPS += gzip
+MAKEFILE_DEPS += tar
+MAKEFILE_DEPS += touch
+MAKEFILE_DEPS += mkdir
+
+#######################################################################################################################
+# Rules
+
+include $(DOBUILDDIR)/cmake.mk
+include $(DOBUILDDIR)/docker.mk
+include $(DOBUILDDIR)/standardrules.mk
+
+$(OUTDIR)/src/%: $(FETCHDIR)/%.tar.gz | $(OUTDIRS)
+	$(SILENT) \
+	     $(call echo_if_silent_cmd,tar -C $(dir $@) -xf $<) \
+	  && tar -I 'gzip -n' -C $(dir $@) -xf $< \
+	  && touch $@
+
+$(FETCH_TARGETS): | $(FETCHDIR)
+	$(SILENT)$(call curl,$@,$(URL),$(MD5))
+
+$(FETCHDIR):
+	$(SILENT)mkdir -p $@
+
+.DELETE_ON_ERROR: $(FETCH_TARGETS)
+

build/dobuild/examples/cmake-gtest-example/builder.dockerfile

@@ -0,0 +1,30 @@
+ARG REGISTRY_PREFIX=''
+ARG BUILDER_TAG=0.0.1
+
+ARG USERID=1000
+ARG PARALLELMFLAGS=-j2
+ARG HOSTMARCH=x86_64
+ARG MARCH=$HOSTMARCH
+ARG DISTRIB_ID=ubuntu
+ARG DISTRIB_VERSION=bionic
+ARG SYS=linux
+ARG ABI=gnu
+
+FROM ${REGISTRY_PREFIX}${HOSTMARCH}/${MARCH}/${DISTRIB_ID}/${DISTRIB_VERSION}/${SYS}/${ABI}/cmake/builder-template:${BUILDER_TAG}
+
+COPY src /usr/local/src
+
+ARG PARALLELMFLAGS=-j2
+
+ARG GTEST_VERSION=1.8.1
+ARG GTEST_MTIME=
+
+RUN set -x \
+  && [ -n "$GTEST_MTIME" ] && export SOURCE_DATE_EPOCH="$GTEST_MTIME" \
+  && builddir="/tmp/out" \
+  && mkdir -p "$builddir" \
+  && cd "$builddir" \
+  && cmake "/usr/local/src/googletest-release-$GTEST_VERSION" \
+  && make "$PARALLELMFLAGS" install \
+  && rm -rf "$builddir"
+

build/dobuild/examples/cmake-gtest-example/test_stringcompare.cpp

@@ -0,0 +1,18 @@
+#include <gtest/gtest.h>
+
+#include <string>
+using std::string;
+
+char const actualValTrue[] = "hello gtest";
+char const actualValFalse[] = "hello world";
+char const expectVal[] = "hello gtest";
+
+TEST(StrCompare, CStrEqual)
+{
+  EXPECT_STREQ(expectVal, actualValTrue);
+}
+
+TEST(StrCompare, CStrNotEqual)
+{
+  EXPECT_STRNE(expectVal, actualValFalse);
+}

build/dobuild/examples/gradle-junit5-example/Makefile

@@ -0,0 +1,57 @@
+SHELL := /bin/sh
+MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+MAKEFLAGS += --no-builtin-rules
+
+.SUFFIXES:
+
+.PHONY: default
+default: all
+
+#######################################################################################################################
+# Overridable project defaults
+
+DOBUILD_TOPDIR ?= $(DOBUILDDIR)
+DOBUILD_PROJECTDIR ?= $(patsubst %/,%,$(dir $(MAKEFILE)))
+DOBUILD_DOCKERFILE ?= $(PROJECTDIR)/%ID%.dockerfile
+
+PROJECTDIR = $(DOBUILD_PROJECTDIR)
+DOBUILDDIR ?= $(PROJECTDIR)/../..
+
+include $(DOBUILDDIR)/defaults.mk
+
+#######################################################################################################################
+# Project defaults and macros
+
+DEFAULTTARGET = x86_64-gradle@6.3-linux-java11+builder
+
+#######################################################################################################################
+# Project dependencies
+
+#######################################################################################################################
+# Architecture-specific rule target configuration
+
+GRADLE_TARGETS += $(call target_properties_combine,\
+    ,\
+    x86_64,\
+    gradle,\
+    linux,\
+    java11,\
+    builder,\
+    6.3,\
+    \
+  )
+DOCKER_TARGETS += $(GRADLE_TARGETS)
+
+#######################################################################################################################
+# Common rule target configuration
+
+#######################################################################################################################
+# Makefile dependencies
+
+#######################################################################################################################
+# Rules
+
+include $(DOBUILDDIR)/gradle.mk
+include $(DOBUILDDIR)/docker.mk
+include $(DOBUILDDIR)/standardrules.mk
+

build/dobuild/examples/gradle-junit5-example/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+	id 'java'
+	id 'eclipse'
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
+}
+
+test {
+	useJUnitPlatform()
+	testLogging {
+		events "passed", "skipped", "failed"
+	}
+}

build/dobuild/examples/gradle-junit5-example/builder.dockerfile

@@ -0,0 +1,15 @@
+ARG REGISTRY_PREFIX=''
+ARG BUILDER_TAG=0.0.1
+
+ARG HOSTMARCH
+ARG MARCH
+ARG DISTRIB_ID
+ARG DISTRIB_VERSION
+ARG SYS
+ARG ABI
+
+FROM ${REGISTRY_PREFIX}${HOSTMARCH}/${MARCH}/graalvm-ce/20.0.0/${SYS}/${ABI}/${DISTRIB_ID}/${DISTRIB_VERSION}:${BUILDER_TAG}
+
+ARG ID=
+ARG VARIANT=
+ARG PARALLELMFLAGS=

build/dobuild/examples/gradle-junit5-example/src/main/java/com/github/nosamad/dobuild/example/Calculator.java

@@ -0,0 +1,9 @@
+package com.github.nosamad.dobuild.example;
+
+public class Calculator {
+
+	public int add(int a, int b) {
+		return a + b;
+	}
+
+}

build/dobuild/examples/gradle-junit5-example/src/test/java/com/github/nosamad/dobuild/example/CalculatorTest.java

@@ -0,0 +1,31 @@
+package com.github.nosamad.dobuild.example;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class CalculatorTests {
+
+	@Test
+	@DisplayName("1 + 1 = 2")
+	void addsTwoNumbers() {
+		Calculator calculator = new Calculator();
+		assertEquals(2, calculator.add(1, 1), "1 + 1 should equal 2");
+	}
+
+	@ParameterizedTest(name = "{0} + {1} = {2}")
+	@CsvSource({
+			"0,    1,   1",
+			"1,    2,   3",
+			"49,  51, 100",
+			"1,  100, 101"
+	})
+	void add(int first, int second, int expectedResult) {
+		Calculator calculator = new Calculator();
+		assertEquals(expectedResult, calculator.add(first, second),
+				() -> first + " + " + second + " should equal " + expectedResult);
+	}
+}