Rename octbstack_test

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

Change-Id: Id9a4ee7642e5f06f7172b5ee8794a537fb7de547
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19161
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript
index c292250..e687d68 100644 (file)
--- a/resource/csdk/connectivity/test/SConscript
+++ b/resource/csdk/connectivity/test/SConscript
@@ -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'])
 

diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript
index 5592049..6420519 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/SConscript
+++ b/resource/csdk/security/provisioning/unittest/SConscript
@@ -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',

diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript
index 8782e86..fd3b074 100644 (file)
--- a/resource/csdk/security/unittest/SConscript
+++ b/resource/csdk/security/unittest/SConscript
@@ -58,7 +58,7 @@ srmtest_env.PrependUnique(CPPPATH = [
                ])
 
 srmtest_env.PrependUnique(LIBS = ['ocsrm',
-                                    'octbstack_test',
+                                    'octbstack_internal',
                                     'oc_logger_internal',
                                     'connectivity_abstraction',
                                     'coap'])

diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript
index fc47c48..d34c8b2 100644 (file)
--- a/resource/csdk/stack/SConscript
+++ b/resource/csdk/stack/SConscript
@@ -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)
 

diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript
index b3b5951..aba6f3f 100644 (file)
--- a/resource/csdk/stack/test/SConscript
+++ b/resource/csdk/stack/test/SConscript
@@ -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',

diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript
index 48011b0..de7d3c0 100755 (executable)
--- a/resource/provisioning/unittests/SConscript
+++ b/resource/provisioning/unittests/SConscript
@@ -68,7 +68,7 @@ provisiontests_env.PrependUnique(LIBS = [
         'ocprovision',
         'oc',
         'ocpmapi_internal',
-        'octbstack_test',
+        'octbstack_internal',
         'oc_logger_internal',
         'connectivity_abstraction',
         'coap',

diff --git a/resource/unittests/SConscript b/resource/unittests/SConscript
index 11a769f..58ec48d 100644 (file)
--- a/resource/unittests/SConscript
+++ b/resource/unittests/SConscript
@@ -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',