Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 22:35:23 +03:00
Code Issues Wiki Activity

Add -flocks only to clang

Browse source
This commit is contained in:
Petr Ledvina 2017-09-27 14:24:58 +02:00
parent f564cdf952
commit acedb4676d
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/test/Makefile
View file

@ -11,6 +11,7 @@
# Where to find user code. # Where to find user code.
USER_DIR = ../main USER_DIR = ../main
TEST_DIR = unit
# specify which files that are included in the test in addition to the unittest file. # specify which files that are included in the test in addition to the unittest file.
@ -35,7 +36,7 @@ arming_prevention_unittest_SRC := \
$(USER_DIR)/fc/runtime_config.c \ $(USER_DIR)/fc/runtime_config.c \
$(USER_DIR)/common/bitarray.c $(USER_DIR)/common/bitarray.c
atomic_unittest_SRC = \ atomic_unittest_SRC := \
$(USER_DIR)/build/atomic.c \ $(USER_DIR)/build/atomic.c \
$(TEST_DIR)/atomic_unittest_c.c $(TEST_DIR)/atomic_unittest_c.c
@ -291,7 +292,6 @@ ringbuffer_unittest_SRC := \
GTEST_DIR = ../../lib/test/gtest GTEST_DIR = ../../lib/test/gtest
TEST_DIR = unit
USER_INCLUDE_DIR = $(USER_DIR) USER_INCLUDE_DIR = $(USER_DIR)
OBJECT_DIR = ../../obj/test OBJECT_DIR = ../../obj/test
@ -313,10 +313,14 @@ COMMON_FLAGS = \
-ggdb3 \ -ggdb3 \
-O0 \ -O0 \
-DUNIT_TEST \ -DUNIT_TEST \
-fblocks \
-isystem $(GTEST_DIR)/inc \ -isystem $(GTEST_DIR)/inc \
-MMD -MP -MMD -MP
ifeq ($(shell $(CC) -v 2>&1 | grep -q "clang version" && echo "clang"),clang)
COMMON_FLAGS += -fblocks
LDFLAGS += -lBlocksRuntime
endif
ifneq ($(UNAME), Darwin) ifneq ($(UNAME), Darwin)
COMMON_FLAGS += -pthread COMMON_FLAGS += -pthread
endif endif
@ -337,9 +341,9 @@ CXX_FLAGS += $(COVERAGE_FLAGS)
# Set up the parameter group linker flags according to OS # Set up the parameter group linker flags according to OS
ifeq ($(UNAME), Darwin) ifeq ($(UNAME), Darwin)
PG_FLAGS = -Wl,-map,$(OBJECT_DIR)/$@.map LDFLAGS += -Wl,-map,$(OBJECT_DIR)/$@.map
else else
PG_FLAGS = -Wl,-T,$(TEST_DIR)/parameter_group.ld -Wl,-Map,$(OBJECT_DIR)/$@.map LDFLAGS += -Wl,-T,$(TEST_DIR)/parameter_group.ld -Wl,-Map,$(OBJECT_DIR)/$@.map
endif endif
# Gather up all of the tests. # Gather up all of the tests.
@ -479,7 +483,7 @@ $(OBJECT_DIR)/$1/$1 : $$($$1_OBJS) \
@echo "linking $$@" "$(STDOUT)" @echo "linking $$@" "$(STDOUT)"
$(V1) mkdir -p $(dir $$@) $(V1) mkdir -p $(dir $$@)
$(V1) $(CXX) $(CXX_FLAGS) $(PG_FLAGS) -lBlocksRuntime $$^ -o $$@ $(V1) $(CXX) $(CXX_FLAGS) $(LDFLAGS) $$^ -o $$@
test_$1: $(OBJECT_DIR)/$1/$1 test_$1: $(OBJECT_DIR)/$1/$1
$(V1) $$< $$(EXEC_OPTS) "$(STDOUT)" && echo "running $$@: PASS" $(V1) $$< $$(EXEC_OPTS) "$(STDOUT)" && echo "running $$@: PASS"

4
src/test/unit/atomic_unittest.cc
View file

@ -61,8 +61,6 @@ TEST(AtomicUnittest, TestAtomicBlockNB)
EXPECT_EQ(atomic_BASEPRI, 0); // restore priority to unlocked EXPECT_EQ(atomic_BASEPRI, 0); // restore priority to unlocked
} }
#if 1 // not working now ... (CLang needs -fblock + libraries / some unittests don't support gcc)
struct barrierTrace { struct barrierTrace {
int enter, leave; int enter, leave;
}; };
@ -112,5 +110,3 @@ TEST(AtomicUnittest, TestAtomicBarrier)
//return sIdx; //return sIdx;
EXPECT_EQ(sIdx, sampled); EXPECT_EQ(sIdx, sampled);
} }
#endif