From 28f0e9673fe2fd3362fa57b5ed515ca7e42a4f85 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Fri, 9 Feb 2018 19:13:05 +0100
Subject: [PATCH] make use of external cms_oracleocci_abi_hack

---
 OnlineDB/Oracle/test/BuildFile.xml    | 10 ++--------
 OnlineDB/Oracle/test/cms_occi_hack.cc |  9 ---------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 OnlineDB/Oracle/test/cms_occi_hack.cc

diff --git a/OnlineDB/Oracle/test/BuildFile.xml b/OnlineDB/Oracle/test/BuildFile.xml
index 617a9204fe3a9..60820343f2e66 100644
--- a/OnlineDB/Oracle/test/BuildFile.xml
+++ b/OnlineDB/Oracle/test/BuildFile.xml
@@ -1,13 +1,7 @@
-<use name="oracleocci"/>
-<library name="cms_occi" file="cms_occi_hack.cc">
-</library>
 <architecture name="_amd64_">
-  <bin name="test_occi_with_cmshack" file="test.cpp">
-    <lib name="cms_occi"/>
+  <bin name="test_occi_std_length" file="test.cpp">
+    <use name="oracleocci"/>
     <flags TEST_RUNNER_ARGS="12154"/>
   </bin>
-  <bin name="test_occi_wo_cmshack" file="test.cpp">
-      <flags TEST_RUNNER_ARGS="12154"/>
-  </bin>
 </architecture>
 
diff --git a/OnlineDB/Oracle/test/cms_occi_hack.cc b/OnlineDB/Oracle/test/cms_occi_hack.cc
deleted file mode 100644
index 6edb159c1be79..0000000000000
--- a/OnlineDB/Oracle/test/cms_occi_hack.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-extern "C" {
-#include <cstdio>
-#include <string.h>
-int _ZNKSs6lengthEv (char **a)
-{
-  char *s = *a;
-  return strlen (s);
-}
-}