Skip to content

Commit aaeb891

Browse files
winlinvipwinlinvip
committed
ST: Refine utest script.
1 parent d1ac9da commit aaeb891

File tree

2 files changed

+36
-49
lines changed

2 files changed

+36
-49
lines changed

‎trunk/3rdparty/st-srs/auto/fast.sh

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/bash
22

3+
PWD=$(cd `dirname $0`/.. && pwd)
4+
5+
pushd $PWD
6+
echo "Run UTest in $(pwd)"
7+
38
IS_LINUX=yes
49
uname -s|grep Darwin >/dev/null && IS_DARWIN=yes && IS_LINUX=no
510
echo "IS_LINUX: $IS_LINUX, IS_DARWIN: $IS_DARWIN"
@@ -13,9 +18,13 @@ if [[ $IS_DARWIN == yes ]]; then
1318
else
1419
make linux-debug-gcov && ./obj/st_utest
1520
fi
21+
ret=$?; if [[ 0 -ne $ret ]]; then echo "Make ST utest fail, ret=$ret"; exit $ret; fi
1622

1723
echo "Generating coverage"
1824
mkdir -p coverage &&
1925
gcovr -r . -e LINUX -e DARWIN -e examples --html --html-details -o coverage/st.html &&
2026
echo "Coverage report at coverage/st.html" &&
2127
open coverage/st.html
28+
29+
popd
30+
echo "UTest done, restore $(pwd)"

‎trunk/3rdparty/st-srs/utest/Makefile

+27-49
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,38 @@
1-
# user must run make the objs/utest dir
2-
# at the same dir of Makefile.
31

4-
# A sample Makefile for building Google Test and using it in user
5-
# tests. Please tweak it to suit your environment and project. You
6-
# may want to move it to your project's root directory.
7-
#
8-
# SYNOPSIS:
9-
#
10-
# make [all] - makes everything.
11-
# make TARGET - makes the given target.
12-
# make clean - removes all files generated by make.
13-
14-
# Please tweak the following variable definitions as needed by your
15-
# project, except GTEST_HEADERS, which you can use in your own targets
16-
# but shouldn't modify.
17-
18-
# Points to the root of Google Test, relative to where this file is.
19-
# Remember to tweak this if you move this file.
20-
GTEST_DIR = ./gtest
21-
22-
# Flags passed to the preprocessor.
23-
CPPFLAGS += -I$(GTEST_DIR)/include
2+
# The main dir of st.
3+
ST_DIR = ..
4+
# The main dir of st utest.
5+
ST_UTEST = .
6+
# The main dir of gtest.
7+
GTEST_DIR = $(ST_UTEST)/gtest
248

259
# Flags passed to the C++ compiler.
2610
CXXFLAGS += -g -O0 -std=c++11
27-
CXXFLAGS += -Wall -Wno-deprecated-declarations -Wno-unused-private-field -Wno-unused-command-line-argument
2811
CXXFLAGS += -DGTEST_USE_OWN_TR1_TUPLE=1
29-
30-
# All tests produced by this Makefile. Remember to add new tests you
31-
# created to the list.
32-
TESTS = ../obj/st_utest
33-
34-
# All Google Test headers. Usually you shouldn't change this
35-
# definition.
36-
GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
37-
$(GTEST_DIR)/include/gtest/internal/*.h
12+
# Flags for warnings.
13+
WARNFLAGS += -Wall -Wno-deprecated-declarations -Wno-unused-private-field -Wno-unused-command-line-argument
3814

3915
# House-keeping build targets.
40-
41-
all : $(TESTS)
16+
all : $(ST_DIR)/obj/st_utest
4217

4318
clean :
44-
rm -f $(TESTS) gtest.a gtest_main.a *.o *.gcno *.gcda
19+
rm -f $(ST_DIR)/obj/st_utest* $(ST_DIR)/obj/gtest*
4520

4621
# Usually you shouldn't tweak such internal variables, indicated by a
4722
# trailing _.
48-
GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
23+
GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_DIR)/include/gtest/*.h $(GTEST_DIR)/include/gtest/internal/*.h
4924

5025
# For simplicity and to avoid depending on Google Test's
5126
# implementation details, the dependencies specified below are
5227
# conservative and not optimized. This is fine as Google Test
5328
# compiles fast and for ordinary users its source rarely changes.
54-
../obj/gtest-all.o : $(GTEST_SRCS_)
55-
$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
56-
$(GTEST_DIR)/src/gtest-all.cc -o $@
29+
$(ST_DIR)/obj/gtest-all.o : $(GTEST_SRCS_)
30+
$(CXX) -c $(GTEST_DIR)/src/gtest-all.cc -o $@ \
31+
$(CXXFLAGS) \
32+
$(WARNFLAGS) \
33+
-I$(GTEST_DIR)/include -I$(GTEST_DIR)
5734

58-
../obj/gtest.a : ../obj/gtest-all.o
35+
$(ST_DIR)/obj/gtest.a : $(ST_DIR)/obj/gtest-all.o
5936
$(AR) $(ARFLAGS) $@ $^
6037

6138
#####################################################################################
@@ -64,19 +41,20 @@ GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
6441
#####################################################################################
6542
#####################################################################################
6643

67-
# Includes, the include dir.
68-
ST_UTEST_INC = -I../obj -I./
69-
7044
# Depends, the depends objects
71-
ST_UTEST_DEPS = ../obj/libst.a
45+
ST_UTEST_DEPS = $(ST_DIR)/obj/libst.a
7246

7347
# Depends, utest header files
74-
UTEST_DEPS = st_utest.hpp
48+
UTEST_DEPS = $(ST_UTEST)/st_utest.hpp
7549

7650
# Objects, build each object of utest
77-
../obj/st_utest.o : st_utest.cpp $(ST_UTEST_DEPS) $(UTEST_DEPS)
78-
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(UTEST_FLAGS) $(ST_UTEST_INC) -c st_utest.cpp -o $@
51+
$(ST_DIR)/obj/st_utest.o : st_utest.cpp $(ST_UTEST_DEPS) $(UTEST_DEPS)
52+
$(CXX) -c st_utest.cpp -o $@ \
53+
$(CXXFLAGS) $(UTEST_FLAGS) \
54+
$(WARNFLAGS) \
55+
-I$(GTEST_DIR)/include -I$(ST_UTEST) -I$(ST_DIR) -I$(ST_DIR)/obj
7956

8057
# generate the utest binary
81-
../obj/st_utest : ../obj/st_utest.o ../obj/gtest.a $(ST_UTEST_DEPS)
82-
$(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(UTEST_FLAGS) $^ -lpthread -ldl
58+
$(ST_DIR)/obj/st_utest : $(ST_DIR)/obj/st_utest.o $(ST_DIR)/obj/gtest.a $(ST_UTEST_DEPS)
59+
$(CXX) -o $@ $(CXXFLAGS) $(UTEST_FLAGS) \
60+
-lpthread -ldl $^

0 commit comments

Comments
 (0)