From c6f1dd65913519cae3f6f1cb69373d884894a18e Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Thu, 25 Apr 2013 11:16:25 +1000
Subject: [PATCH] Load test IP and PORT numbers when SICS_SIMULATION is set.

---
 site_ansto/instrument/server_config.tcl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl
index 23970575..b708853a 100644
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -56,6 +56,13 @@ if {[info exists env(SICS_SIMULATION)] != 1} {
     # sics_exitus
   }
 } else {
+  if [file exists hostport_config_test.tcl] {
+    fileeval hostport_config_test.tcl
+  } else {
+#TODO SICS-587 Abort with error when all instruments have been refactored.
+    clientput ERROR: hostport_config_test.tcl is missing
+    sics_exitus
+  }
   switch $env(SICS_SIMULATION) {
     "full" {
       set sicsroot ../
@@ -66,13 +73,6 @@ if {[info exists env(SICS_SIMULATION)] != 1} {
       set sicsroot ../
       source sics_ports.tcl
       sics_simulation fakedev
-      if [file exists hostport_config_test.tcl] {
-        fileeval hostport_config_test.tcl
-      } else {
-    #TODO SICS-587 Abort with error when all instruments have been refactored.
-        clientput ERROR: hostport_config_test.tcl is missing
-        sics_exitus
-      }
     }
     "script_validator" {
       VarMake sics_script_validator Text internal
@@ -88,6 +88,7 @@ if {[info exists env(SICS_SIMULATION)] != 1} {
     }
   }
 
+  # Set obj_simulation flags for each SICS_SIMULATION mode
   switch $env(SICS_SIMULATION) {
     "full" - "simdriv" - "script_validator" {
       dict for {simflag d} $SIMFLAG_VAL {