6 files changed, 11 insertions, 16 deletions
diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc
index 7317f1c5c..ff9d3da14 100644
--- a/src/mem/ruby/tester/DeterministicDriver.cc
+++ b/src/mem/ruby/tester/DeterministicDriver.cc
@@ -45,8 +45,8 @@
 
 DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
 {
-  if (g_SIMICS) {
-    ERROR_MSG("g_SIMICS should not be defined.");
+  if (g_SIMULATING) {
+    ERROR_MSG("g_SIMULATING should not be defined.");
   }
 
   m_finish_time = 0;
diff --git a/src/mem/ruby/tester/RaceyDriver.cc b/src/mem/ruby/tester/RaceyDriver.cc
index 5b1e7e3f7..c5cdcaa4b 100644
--- a/src/mem/ruby/tester/RaceyDriver.cc
+++ b/src/mem/ruby/tester/RaceyDriver.cc
@@ -41,8 +41,8 @@
 
 RaceyDriver::RaceyDriver()
 {
-  if (g_SIMICS) {
-    ERROR_MSG("g_SIMICS should not be defined.");
+  if (g_SIMULATING) {
+    ERROR_MSG("g_SIMULATING should not be defined.");
   }
 
   // debug transition?
diff --git a/src/mem/ruby/tester/SyntheticDriver.cc b/src/mem/ruby/tester/SyntheticDriver.cc
index f9f7b91b2..f5986de15 100644
--- a/src/mem/ruby/tester/SyntheticDriver.cc
+++ b/src/mem/ruby/tester/SyntheticDriver.cc
@@ -47,8 +47,8 @@
 SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
 {
   cout << "SyntheticDriver::SyntheticDriver" << endl;
-  if (g_SIMICS) {
-    ERROR_MSG("g_SIMICS should not be defined.");
+  if (g_SIMULATING) {
+    ERROR_MSG("g_SIMULATING should not be defined.");
   }
 
   m_finish_time = 0;
diff --git a/src/mem/ruby/tester/Tester.cc b/src/mem/ruby/tester/Tester.cc
index 6c12ff471..60b625120 100644
--- a/src/mem/ruby/tester/Tester.cc
+++ b/src/mem/ruby/tester/Tester.cc
@@ -42,8 +42,8 @@
 
 Tester::Tester(RubySystem* sys_ptr)
 {
-  if (g_SIMICS) {
-    ERROR_MSG("g_SIMICS should not be defined.");
+  if (g_SIMULATING) {
+    ERROR_MSG("g_SIMULATING should not be defined.");
   }
 
   g_callback_counter = 0;
diff --git a/src/mem/ruby/tester/main.cc b/src/mem/ruby/tester/main.cc
index 9642fd5b7..10cc526be 100644
--- a/src/mem/ruby/tester/main.cc
+++ b/src/mem/ruby/tester/main.cc
@@ -43,8 +43,8 @@
 
 int main(int argc, char *argv[])
 {
-  if (g_SIMICS) {
-    ERROR_MSG("g_SIMICS should not be defined.");
+  if (g_SIMULATING) {
+    ERROR_MSG("g_SIMULATING should not be defined.");
   }
 
   tester_main(argc, argv);
diff --git a/src/mem/ruby/tester/test_framework.cc b/src/mem/ruby/tester/test_framework.cc
index 02320c871..e3a16920b 100644
--- a/src/mem/ruby/tester/test_framework.cc
+++ b/src/mem/ruby/tester/test_framework.cc
@@ -35,7 +35,6 @@
 #include "protocol_name.hh"
 #include "test_framework.hh"
 #include "System.hh"
-#include "OpalInterface.hh"
 #include "init.hh"
 #include "Tester.hh"
 #include "RubyEventQueue.hh"
@@ -157,11 +156,7 @@ void tester_destroy()
 
 void tester_install_opal(mf_opal_api_t* opal_api, mf_ruby_api_t* ruby_api)
 {
-  // initialize our api interface
-  OpalInterface::installInterface(ruby_api);
-
-  // update the OpalInterface object to point to opal's interface
-  ((OpalInterface *) g_system_ptr->getDriver())->setOpalInterface(opal_api);
+  std::cout << __FILE__ << "(" << __LINE__ << "): Not implemented" << std::endl;
 }
 
 void tester_record_cache()