Menu
▾
▴
[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-407-g3884f36
|
From: Chris B. <buc...@us...> - 2013-03-08 20:40:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 3884f36555f8f67c46ae81162e14daadef3b15bd (commit)
via 8c1dacd1c14baf757b506247215f1a34b0d590f1 (commit)
from e94199e0c0ef04862ebf71fd217e7e9e5bec168d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3884f36555f8f67c46ae81162e14daadef3b15bd
Author: buccella <buc...@li...>
Date: Fri Mar 8 15:38:12 2013 -0500
[sfcb-tix:#26] ClassProviderSf should read standard repositories
commit 8c1dacd1c14baf757b506247215f1a34b0d590f1
Author: buccella <buc...@li...>
Date: Fri Mar 8 15:37:51 2013 -0500
[sfcb-tix:#26] ClassProviderSf should read standard repositories
-----------------------------------------------------------------------
Summary of changes:
classProviderSf.c | 8 ++-
.../TestProviders/tests/Test1EnumerateInstances.OK | 73 --------------------
...cQuery2.lines => Test1EnumerateInstances.lines} | 38 ++++------
test/TestProviders/tests/xmltest.sh | 4 +-
test/xmltest/xmltest.sh | 4 +-
5 files changed, 26 insertions(+), 101 deletions(-)
diff --git a/classProviderSf.c b/classProviderSf.c
index 404a860..a1cc362 100644
--- a/classProviderSf.c
+++ b/classProviderSf.c
@@ -396,7 +396,7 @@ newClassRegister(char *fname)
int v = -1;
int r = -1;
first = 0;
- if (ClVerifyObjImplLevel(cr->vr) && (r = cr->vr->options == ClTypeClassReducedRep))
+ if (ClVerifyObjImplLevel(cr->vr))
continue;
if (cr->vr)
@@ -713,6 +713,12 @@ getResolvedClass(ClassRegister * cr, const char *clsName,
{
_SFCB_ENTER(TRACE_PROVIDERS, "getResolvedClass");
_SFCB_TRACE(1, ("--- classname %s cReg %p", clsName, cr));
+
+ /* if standard repo, skip straight to normal gc */
+ if (cr->vr->options != ClTypeClassReducedRep) {
+ return getClass(cr, clsName, rctl);
+ }
+
CMPIConstClass *cc = NULL,
*cls = NULL;
ReadCtl ctl = *rctl;
diff --git a/test/TestProviders/tests/Test1EnumerateInstances.OK b/test/TestProviders/tests/Test1EnumerateInstances.OK
deleted file mode 100644
index e87011f..0000000
--- a/test/TestProviders/tests/Test1EnumerateInstances.OK
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CIM CIMVERSION="2.0" DTDVERSION="2.0">
-<MESSAGE ID="10001" PROTOCOLVERSION="1.0">
-<SIMPLERSP>
-<IMETHODRESPONSE NAME="EnumerateInstances">
-<IRETURNVALUE>
-<VALUE.NAMEDINSTANCE>
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
-<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
-<VALUE><![CDATA[<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>I'm an EmbeddedObject</VALUE>
-</PROPERTY>
-</INSTANCE>
-]]></VALUE>
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>Hello World</VALUE>
-</PROPERTY>
-</INSTANCE>
-</VALUE.NAMEDINSTANCE>
-<VALUE.NAMEDINSTANCE>
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
-<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>Yo Planet</VALUE>
-</PROPERTY>
-</INSTANCE>
-</VALUE.NAMEDINSTANCE>
-<VALUE.NAMEDINSTANCE>
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
-<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>3</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>Hey Earth</VALUE>
-</PROPERTY>
-</INSTANCE>
-</VALUE.NAMEDINSTANCE>
-</IRETURNVALUE>
-</IMETHODRESPONSE>
-</SIMPLERSP>
-</MESSAGE>
-</CIM>
diff --git a/test/TestProviders/tests/Test7ExecQuery2.lines b/test/TestProviders/tests/Test1EnumerateInstances.lines
similarity index 59%
copy from test/TestProviders/tests/Test7ExecQuery2.lines
copy to test/TestProviders/tests/Test1EnumerateInstances.lines
index ffc8423..dd8dd25 100644
--- a/test/TestProviders/tests/Test7ExecQuery2.lines
+++ b/test/TestProviders/tests/Test1EnumerateInstances.lines
@@ -1,39 +1,31 @@
<INSTANCENAME CLASSNAME="Sample_Instance">
<KEYBINDING NAME="Identifier">
<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
-</PROPERTY>
-</INSTANCE>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+[CDATA[
+<PROPERTY NAME="Identifier" TYPE="uint8">
+<VALUE>1</VALUE>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>I'm an EmbeddedObject</VALUE>
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>Hello World</VALUE>
<INSTANCENAME CLASSNAME="Sample_Instance">
<KEYBINDING NAME="Identifier">
<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>2</VALUE>
-</PROPERTY>
-</INSTANCE>
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>Yo Planet</VALUE>
<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>3</VALUE>
-</PROPERTY>
-</INSTANCE>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>Hey Earth</VALUE>
diff --git a/test/TestProviders/tests/xmltest.sh b/test/TestProviders/tests/xmltest.sh
index 82c43c1..3037e58 100755
--- a/test/TestProviders/tests/xmltest.sh
+++ b/test/TestProviders/tests/xmltest.sh
@@ -97,7 +97,7 @@ do
notline=$(echo $line | awk '{ line=index($line,"!"); print line; }' )
if [ "$notline" != 0 ] ; then
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
- if grep --q "$text" $_TESTRESULT ; then
+ if grep -F --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo "FAILED disallowed line found"
@@ -110,7 +110,7 @@ do
fi
else
# Check for required lines
- if ! grep --q "$line" $_TESTRESULT ; then
+ if ! grep -F --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo "FAILED required line not found"
diff --git a/test/xmltest/xmltest.sh b/test/xmltest/xmltest.sh
index c0955d3..a6051ad 100755
--- a/test/xmltest/xmltest.sh
+++ b/test/xmltest/xmltest.sh
@@ -100,7 +100,7 @@ do
notline=$(echo $line | awk '{ line=index($line,"!"); print line; }' )
if [ "$notline" != 0 ] ; then
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
- if grep --q "$text" $_TESTRESULT ; then
+ if grep -F --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
echo -n "FAILED disallowed line found"
passed=1
@@ -111,7 +111,7 @@ do
fi
else
# Check for required lines
- if ! grep --q "$line" $_TESTRESULT ; then
+ if ! grep -F --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo -n "FAILED required line not found"
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
