From: sanjaysh <sanjay1.sharma@intel.com>
Date: Wed, 13 May 2015 16:29:12 +0000 (-0700)
Subject: Change in stacktest.cpp
X-Git-Tag: 0.9.1~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7dcd5ffd64d80559d4654df91ea75b7b41c0ed33;p=contrib%2Fiotivity.git

Change in stacktest.cpp

conflict of variable OC_RSVD_INTERFACE_DEFAULT from two files.
Removed explicit declaration from two test casses in this file.

Change-Id: I146a144861dcff07513a20af0b5bb81ed8aa14f4
Signed-off-by: sanjaysh <sanjay1.sharma@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/978
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
---

diff --git a/resource/csdk/stack/test/stacktests.cpp b/resource/csdk/stack/test/stacktests.cpp
index 9708660..ce85f70 100644
--- a/resource/csdk/stack/test/stacktests.cpp
+++ b/resource/csdk/stack/test/stacktests.cpp
@@ -483,7 +483,6 @@ TEST(StackResource, ResourceDefaultInterfaceAlwaysFirst)
 {
     itst::DeadmanTimer killSwitch(SHORT_TEST_TIMEOUT);
 
-    const char * OC_RSRVD_INTERFACE_DEFAULT = "oc.mi.def";
     OC_LOG(INFO, TAG, "Starting ResourceDefaultInterfaceAlwaysFirst test");
 
     InitStack(OC_SERVER);
@@ -514,7 +513,6 @@ TEST(StackResource, ResourceDuplicateDefaultInterfaces)
 {
     itst::DeadmanTimer killSwitch(SHORT_TEST_TIMEOUT);
 
-    const char * OC_RSRVD_INTERFACE_DEFAULT = "oc.mi.def";
     OC_LOG(INFO, TAG, "Starting ResourceDuplicateDefaultInterfaces test");
 
     InitStack(OC_SERVER);