Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
30198a34
Commit
30198a34
authored
May 24, 2012
by
Mukund Sivaraman
Browse files
[1704] Use top_builddir during tests as top_srcdir may not be writable
parent
c0a328b2
Changes
11
Hide whitespace changes
Inline
Side-by-side
src/lib/log/tests/Makefile.am
View file @
30198a34
...
...
@@ -2,7 +2,7 @@ SUBDIRS = .
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CPPFLAGS
+=
-DTOP_
SRC
DIR
=
\"
${abs_top_
src
dir}
\"
AM_CPPFLAGS
+=
-DTOP_
BUILD
DIR
=
\"
${abs_top_
build
dir}
\"
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
AM_LDADD
=
AM_LDFLAGS
=
...
...
src/lib/log/tests/console_test.sh.in
View file @
30198a34
...
...
@@ -16,7 +16,7 @@
# The logger supports the idea of a "console" logger than logs to either stdout
# or stderr. This test checks that both these options work.
export
B10_FROM_SOURCE
=
@abs_top_
src
dir@
export
B10_FROM_SOURCE
=
@abs_top_
build
dir@
testname
=
"Console output test"
echo
$testname
...
...
src/lib/log/tests/destination_test.sh.in
View file @
30198a34
...
...
@@ -15,7 +15,7 @@
# Checks that the logger will route messages to the chosen destination.
export
B10_FROM_SOURCE
=
@abs_top_
src
dir@
export
B10_FROM_SOURCE
=
@abs_top_
build
dir@
testname
=
"Destination test"
echo
$testname
...
...
src/lib/log/tests/init_logger_test.sh.in
View file @
30198a34
...
...
@@ -16,7 +16,7 @@
# Checks that the initLogger() call uses for unit tests respects the setting of
# the environment variables.
export
B10_FROM_SOURCE
=
@abs_top_
src
dir@
export
B10_FROM_SOURCE
=
@abs_top_
build
dir@
testname
=
"initLogger test"
echo
$testname
...
...
src/lib/log/tests/local_file_test.sh.in
View file @
30198a34
...
...
@@ -16,7 +16,7 @@
# Checks that a local message file can override the definitions in the message
# dictionary.
export
B10_FROM_SOURCE
=
@abs_top_
src
dir@
export
B10_FROM_SOURCE
=
@abs_top_
build
dir@
testname
=
"Local message file test"
echo
$testname
...
...
src/lib/log/tests/run_initializer_unittests.cc
View file @
30198a34
...
...
@@ -21,6 +21,6 @@
int
main
(
int
argc
,
char
*
argv
[])
{
::
testing
::
InitGoogleTest
(
&
argc
,
argv
);
setenv
(
"B10_FROM_SOURCE"
,
TOP_
SRC
DIR
,
1
);
setenv
(
"B10_FROM_SOURCE"
,
TOP_
BUILD
DIR
,
1
);
return
(
isc
::
util
::
unittests
::
run_all
());
}
src/lib/log/tests/run_unittests.cc
View file @
30198a34
...
...
@@ -21,7 +21,7 @@
int
main
(
int
argc
,
char
*
argv
[])
{
::
testing
::
InitGoogleTest
(
&
argc
,
argv
);
setenv
(
"B10_FROM_SOURCE"
,
TOP_
SRC
DIR
,
1
);
setenv
(
"B10_FROM_SOURCE"
,
TOP_
BUILD
DIR
,
1
);
isc
::
log
::
initLogger
();
return
(
isc
::
util
::
unittests
::
run_all
());
}
src/lib/log/tests/severity_test.sh.in
View file @
30198a34
...
...
@@ -16,7 +16,7 @@
# Checks that the logger will limit the output of messages less severe than
# the severity/debug setting.
export
B10_FROM_SOURCE
=
@abs_top_
src
dir@
export
B10_FROM_SOURCE
=
@abs_top_
build
dir@
testname
=
"Severity test"
echo
$testname
...
...
src/lib/python/isc/log/tests/Makefile.am
View file @
30198a34
...
...
@@ -28,7 +28,7 @@ endif
$(LIBRARY_PATH_PLACEHOLDER)
\
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/lib/python/isc/log:$(abs_top_builddir)/src/lib/log/python/.libs
\
B10_TEST_PLUGIN_DIR=$(abs_top_srcdir)/src/bin/cfgmgr/plugins
\
B10_FROM_SOURCE=$(abs_top_
src
dir)
\
B10_FROM_SOURCE=$(abs_top_
build
dir)
\
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ;
\
done ;
\
for pytest in $(PYTESTS_GEN) ; do
\
...
...
src/lib/util/tests/Makefile.am
View file @
30198a34
...
...
@@ -7,7 +7,6 @@ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_builddir)\"
# used to bind a UNIX domain socket so we can minimize the risk of exceeding
# the limit of file name path size.
AM_CPPFLAGS
+=
-DTEST_DATA_TOPBUILDDIR
=
\"
$(abs_top_builddir)
\"
AM_CPPFLAGS
+=
-DTOP_SRCDIR
=
\"
${abs_top_srcdir}
\"
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
if
USE_STATIC_LINK
...
...
src/lib/util/tests/run_unittests.cc
View file @
30198a34
...
...
@@ -20,6 +20,6 @@ int
main
(
int
argc
,
char
*
argv
[])
{
::
testing
::
InitGoogleTest
(
&
argc
,
argv
);
setenv
(
"B10_FROM_SOURCE"
,
T
OP_SRC
DIR
,
1
);
setenv
(
"B10_FROM_SOURCE"
,
T
EST_DATA_TOPBUILD
DIR
,
1
);
return
(
isc
::
util
::
unittests
::
run_all
());
}
Write
Preview
Supports
Markdown
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