http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml
deleted file mode 100644
index 47bfc98..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">false</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  
subscription-redundancy="1" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf107" description="Durable client repeatedly creates and 
closes a connection pool using autodiscovery.  
-  Durable interest is not kept alive.  Measures time to connect and 
disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml
deleted file mode 100644
index a7034c6..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  
subscription-redundancy="1" servers="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf108" description="Durable client repeatedly creates and 
closes a connection pool using explicit servers.  
-  Durable interest is kept alive.  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml
deleted file mode 100644
index d05c2b2..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  
subscription-redundancy="1" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf109" description="Durable client repeatedly creates and 
closes a connection pool using autodiscovery.  
-  Durable interest is kept alive.  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml
deleted file mode 100644
index 52de184..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1" 
subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="securityScheme">
-    <list>
-      <item>NOOP</item>
-  </list>
-  </data>
-
-  <data name="disableShufflingEP">true</data>
-  <data name="contactNum">1</data>
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf110" description="Edge clients create and close a connection 
pool using explicit servers and security authorization scheme. 
-    Runs on two hosts.  Measures time to connect to server when throttled by 
20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e 
CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar 
smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="cyclePoolTask" action="doCyclePoolTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml
deleted file mode 100644
index 79067c8..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1" 
subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-  <data name="securityScheme">
-    <list>
-      <item>NOOP</item>
-  </list>
-  </data>
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf111" description="Edge clients create and close a connection 
pool using autodiscovery and security authorization scheme. 
-    Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="cyclePoolTask" action="doCyclePoolTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml
deleted file mode 100644
index b1e8e67..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" servers="true" 
/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf112" description="Empty edge clients fetch entries on 
server.  Does not use selector.  Runs on two hosts. 
-     Entries are byte arrays of size 1024. Does not use thread local 
connections.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml
deleted file mode 100644
index 01d3d6b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">SizedString</data>
-  <data name="clientCount">1</data>
-  <data name="durableTimeout">600</data>
-  <data name="isDurableReg">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="smokeperf" 
function="createDurableCacheListenerSP"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="poolSpec">ThinClientPool1</data>
-  <client-set name="Feeder" hostGroup="CS1"/>
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf113" description="Cycles between a client putting data to 
the server with overflow to disk and a durable client receiving those updates.  
-  Measures the time it takes the durable client to receive updates.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorWithOFtoDisk.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="3m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="putData" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="20m" parallel="true">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="cycleDurableClientTask" action="doCycleDurableClientTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="10m" parallel="true">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf098.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml
deleted file mode 100644
index 91600f9..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" subscription-redundancy="1" 
read-timeout="100000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" 
pool-name="_Test_Pool1">
-        <!--cache-listener library="smokeperf"  
function="createLatencyListener"/-->
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf114" description="Empty edge clients update entries on 
replicated servers using putAll in batches of 100. 
-    Each client puts its own subset of the keys and registers interest in all 
keys.  Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Create Entries Map" action="doCreateEntryMapTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="PutAll in Region" action="doPutAllEntryMapTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf021.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml
deleted file mode 100644
index d71d614..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" subscription-redundancy="1" 
read-timeout="100000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" 
pool-name="_Test_Pool1">
-        <!--cache-listener library="smokeperf" 
function="createLatencyListener"/-->
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf115" description="Empty edge clients update entries on 
replicated servers using putAll in batches of 100. 
-    Each client puts its own subset of the keys and registers interest in all 
keys.  Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSTrueRC1.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <!--task name="Create Entries Map" action="doCreateEntryMapTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task-->
-    <task name="PutAll in Region" action="doPutAllEntryMapTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf021.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml
deleted file mode 100644
index fd17f47..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaFastAssetAccount</data>
-  <data name="clientCount">1</data>
-  <!--data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data-->
-  <data name="AssetAccountSize">50</data>
-  <data name="encodeTimestamp">true</data>
-  <!--encode key used as getBeforeUpdate parameter in the delta test /-->
-  <data name="encodeKey">false</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" 
pool-name="_Test_Pool1">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf148" description="Empty edge clients update entries on 
replicated servers using delta propagation. Get before update is false.  
Cloning enabled is false.  Does not use selector.  Entries are DataSerializable 
DeltaFastAssetAccounts with 50 FastAssets.  Runs on two hosts.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e 
CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH 
smoketest/perf/csDeltaReplicateCloningFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doUpdateDeltaData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf145.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml
deleted file mode 100644
index 557cf3a..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">1</data>
-  <!--data name="disableShufflingEP">true</data>
-  <data name="contactNum">1</data-->
-  <!--encode key used as getBeforeUpdate parameter in the delta test /-->
-  <data name="encodeKey">true</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" 
pool-name="_Test_Pool1">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf149" description="Empty edge clients update entries on 
partitioned servers using delta propagation. Get before update is true.  
Cloning enabled is false.  Use selector.  Entries are DataSerializable 
DeltaPSTObjects with byte arrays of size 102400.  Runs on two hosts.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e 
CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH 
smoketest/perf/csDeltaPRCloningFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doUpdateDeltaData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf145.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml
deleted file mode 100644
index ac6c32b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">1</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <!--encode key used as getBeforeUpdate parameter in the delta test /-->
-  <data name="encodeKey">false</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" read-timeout="100000" 
subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" 
pool-name="_Test_Pool1">
-        <cache-listener library="smokeperf" function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" 
pool-name="_Test_Pool1">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set name="feeder" hostGroup="CS2"/>
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf150" description="Empty edge clients get updates on entries 
in partitioned servers. An accessor data feed carries out the updates using 
delta propagation. Get before update is false.  Cloning enabled is false.  
Conserve sockets is false.  Entries are DeltaPSTObjects with byte arrays of 
size 1024.  Runs on two hosts. ">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e 
CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH 
smoketest/perf/csDeltaPRCloningFalseNSTrue.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 768 -X 768 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 768 -X 768 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set name="feeder"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set name="feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Update Entries in Region" action="doUpdateDeltaData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf150.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml
deleted file mode 100644
index 0b2728f..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" max-connections="8" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf152" description="Empty edge clients do 80% fetches and and 
20% updates on entries from partitioned servers.  Runs on two hosts.  Entries 
are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml
deleted file mode 100644
index 83574e4..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" max-connections="30" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" 
pr-single-hop-enabled="false"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="perf153" description="Empty edge clients do 80% fetches and and 
20% updates on entries from partitioned servers. pr_single_hop pool atrribute 
is false. Runs on two hosts.  Entries are DataSerializable PSTObjects with byte 
arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml 
b/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml
deleted file mode 100644
index 211fcbd..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="true" max-connections="30" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" 
pr-single-hop-enabled="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="perf154" description="Empty edge clients do 80% fetches and and 
20% updates on entries from partitioned servers. pr_single_hop pool atrribute 
is true. Runs on two hosts.  Entries are DataSerializable PSTObjects with byte 
arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N 
-J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

Reply via email to