Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
2cf16de4
Commit
2cf16de4
authored
7 years ago
by
gejun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid concurrent submake in makefile of UT
parent
19ad43f3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
Makefile
test/Makefile
+3
-3
run_tests.sh
test/run_tests.sh
+4
-4
No files found.
test/Makefile
View file @
2cf16de4
...
...
@@ -149,7 +149,7 @@ clean_bins:
clean_debug
:
@
$(MAKE)
-C
.. clean_debug
../libbrpc.dbg.a
../libbvar.dbg.a
:
FORCE
../libbrpc.dbg.a
:
FORCE
@
$(MAKE)
-C
.. debug
FORCE
:
...
...
@@ -160,9 +160,9 @@ test_butil:$(TEST_BUTIL_OBJS) ../libbrpc.dbg.a
@
echo
"Linking
$@
"
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
test_bvar
:
$(TEST_BVAR_OBJS) ../libb
var
.dbg.a
test_bvar
:
$(TEST_BVAR_OBJS) ../libb
rpc
.dbg.a
@
echo
"Linking
$@
"
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$
^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$
(TEST_BVAR_OBJS)
../libbvar.dbg.a
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
bthread%unittest
:
bthread%unittest.o ../libbrpc.dbg.a
@
echo
"Linking
$@
"
...
...
This diff is collapsed.
Click to expand it.
test/run_tests.sh
View file @
2cf16de4
...
...
@@ -9,18 +9,18 @@ for test_bin in $test_bins; do
>
&2
echo
"[runtest]
$test_bin
"
./
$test_bin
rc
=
$?
if
[
[
$rc
-ne
0
]
]
;
then
if
[
$rc
-ne
0
]
;
then
failed_test
=
"
$test_bin
"
break
;
fi
done
if
[
[
$test_num
-eq
0
]
]
;
then
if
[
$test_num
-eq
0
]
;
then
>
&2
echo
"[runtest] Cannot find any tests"
exit
1
fi
if
[
[
-z
"
$failed_test
"
]
]
;
then
if
[
-z
"
$failed_test
"
]
;
then
>
&2
echo
"[runtest]
$test_num
succeeded"
elif
[
[
$test_num
-gt
1
]
]
;
then
elif
[
$test_num
-gt
1
]
;
then
>
&2
echo
"[runtest] '
$failed_test
' failed,
$((
test_num-1
))
succeeded"
else
>
&2
echo
"[runtest] '
$failed_test
' failed"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment