Commit a7d4fb34 authored by Dan Mihai's avatar Dan Mihai

Rename octbstack_test

Rename octbstack_test to octbstack_internal - consistent with other
*_internal LIBS.

Change-Id: Id9a4ee7642e5f06f7172b5ee8794a537fb7de547
Signed-off-by: default avatarDan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19161Reviewed-by: default avatarDave Thaler <dthaler@microsoft.com>
Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
parent 7d315f28
......@@ -52,7 +52,7 @@ catest_env.PrependUnique(CPPPATH = [
'#/resource/oc_logger/include',
])
catest_env.PrependUnique(LIBS = ['octbstack_test',
catest_env.PrependUnique(LIBS = ['octbstack_internal',
'connectivity_abstraction',
'coap'])
......
......@@ -63,7 +63,7 @@ sptest_env.PrependUnique(CPPPATH = [
sptest_env.PrependUnique(LIBS = [ 'ocpmapi_internal',
'oc',
'octbstack_test',
'octbstack_internal',
'ocsrm',
'oc_logger_internal',
'connectivity_abstraction',
......
......@@ -58,7 +58,7 @@ srmtest_env.PrependUnique(CPPPATH = [
])
srmtest_env.PrependUnique(LIBS = ['ocsrm',
'octbstack_test',
'octbstack_internal',
'oc_logger_internal',
'connectivity_abstraction',
'coap'])
......
......@@ -228,9 +228,9 @@ if target_os in ['linux']:
# Linux uses a Shared library because SCons chooses the shared library on Linux
# when only 'octbstack' is added to the LIBS.
# TODO: Switch Linux to use a Static library for testing like every other OS.
test_liboctbstack = liboctbstack_env.SharedLibrary('octbstack_test', liboctbstack_src)
test_liboctbstack = liboctbstack_env.SharedLibrary('octbstack_internal', liboctbstack_src)
else:
test_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_test', liboctbstack_src)
test_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_internal', liboctbstack_src)
octbstack_libs = Flatten(test_liboctbstack)
......
......@@ -46,7 +46,7 @@ stacktest_env.PrependUnique(CPPPATH = [
'../../../oc_logger/include',
])
stacktest_env.PrependUnique(LIBS = ['octbstack_test',
stacktest_env.PrependUnique(LIBS = ['octbstack_internal',
'ocsrm',
'connectivity_abstraction',
'coap',
......
......@@ -68,7 +68,7 @@ provisiontests_env.PrependUnique(LIBS = [
'ocprovision',
'oc',
'ocpmapi_internal',
'octbstack_test',
'octbstack_internal',
'oc_logger_internal',
'connectivity_abstraction',
'coap',
......
......@@ -51,13 +51,13 @@ unittests_env.PrependUnique(CPPPATH = [
if target_os in ['windows']:
unittests_env.AppendUnique(CPPPATH = ['#extlibs/boost/boost'])
unittests_env.AppendUnique(LIBS = ['sqlite3'])
# On Windows, octbstack_test is a static LIB, that makes calls into static LIB ocsrm.
# On other platforms, octbstack_test is a shared LIB, that includes static LIB ocsrm.
# On Windows, octbstack_internal is a static LIB, that makes calls into static LIB ocsrm.
# On other platforms, octbstack_internal is a shared LIB, that includes static LIB ocsrm.
unittests_env.AppendUnique(LIBS = ['ocsrm'])
unittests_env.PrependUnique(LIBS = [
'oc',
'octbstack_test',
'octbstack_internal',
'oc_logger_internal',
'connectivity_abstraction',
'coap',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment