зеркало из https://github.com/Azure/umock-c.git
Add Ctest as dependency and fix macro_utils issue
This commit is contained in:
Родитель
c93bd6590a
Коммит
754a2715c8
|
@ -0,0 +1,2 @@
|
|||
#Typical cmake folder
|
||||
/cmake
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "deps/azure-ctest"]
|
||||
path = deps/azure-ctest
|
||||
url = https://github.com/Azure/azure-ctest.git
|
|
@ -4,6 +4,12 @@
|
|||
#this is CMakeLists for umock_c
|
||||
cmake_minimum_required(VERSION 2.8.11)
|
||||
|
||||
option(skip_unittests "set skip_unittests to ON to skip unittests (default is OFF)[if possible, they are always build]" OFF)
|
||||
|
||||
project(umock_c)
|
||||
|
||||
add_subdirectory(deps)
|
||||
|
||||
set(umock_c_c_files
|
||||
./src/umock_c.c
|
||||
./src/umock_c_negative_tests.c
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
#Copyright (c) Microsoft. All rights reserved.
|
||||
#Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
cmake_minimum_required(VERSION 2.8.11)
|
||||
|
||||
add_subdirectory(azure-ctest)
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 056a641f6106e7fe1993a1bcfcfd6eb2d26b6abf
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -10,7 +10,7 @@ extern "C" {
|
|||
#else
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#include "umockcallrecorder.h"
|
||||
|
||||
#define UMOCK_C_ERROR_CODE_VALUES \
|
||||
|
|
|
@ -13,7 +13,7 @@ extern "C" {
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#include "umocktypes.h"
|
||||
#include "umockcall.h"
|
||||
#include "umockcallrecorder.h"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#else
|
||||
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
|
||||
#define UMOCK_C_PROD_ARG_IN_SIGNATURE(count, arg_type, arg_name) arg_type arg_name IFCOMMA(count)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#ifndef UMOCKTYPES_BOOL_H
|
||||
#define UMOCKTYPES_BOOL_H
|
||||
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#ifndef UMOCKTYPES_C_H
|
||||
#define UMOCKTYPES_C_H
|
||||
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#ifndef UMOCKTYPES_STDINT_H
|
||||
#define UMOCKTYPES_STDINT_H
|
||||
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#ifdef __cplusplus
|
||||
#include <cstdint>
|
||||
extern "C" {
|
||||
|
|
|
@ -17,9 +17,9 @@ if not ERRORLEVEL==0 exit /b ERRORLEVEL
|
|||
cmake ..
|
||||
if not ERRORLEVEL==0 exit /b ERRORLEVEL
|
||||
|
||||
msbuild /m ctest.sln /p:Configuration=Release
|
||||
msbuild /m umock_c.sln /p:Configuration=Release
|
||||
if not ERRORLEVEL==0 exit /b ERRORLEVEL
|
||||
msbuild /m ctest.sln /p:Configuration=Debug
|
||||
msbuild /m umock_c.sln /p:Configuration=Debug
|
||||
if not ERRORLEVEL==0 exit /b ERRORLEVEL
|
||||
|
||||
ctest -C "debug" -V
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#include "umocktypes.h"
|
||||
#include "umock_c.h"
|
||||
#include "umockalloc.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#include "umocktypes.h"
|
||||
#include "umocktypes_c.h"
|
||||
#include "umockalloc.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "umocktypes.h"
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#include "umocktypes_charptr.h"
|
||||
#include "umockalloc.h"
|
||||
#include "umock_log.h"
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include "azure_c_shared_utility/macro_utils.h"
|
||||
#include "macro_utils.h"
|
||||
#include "umocktypes.h"
|
||||
#include "umocktypes_stdint.h"
|
||||
#include "umockalloc.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче