Commit 4f37f0fe authored by Greg Williams's avatar Greg Williams
Browse files

Moved simulator support scripts into scripts/ folder for easy finding.

parent cb074abf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -305,12 +305,12 @@ update_simulator:
	cp vendor/kinetic-java/kinetic-simulator/target/*.jar vendor/kinetic-java-simulator/

start_sims:
	./vendor/kinetic-simulator/startSimulators.sh
	./scripts/startSimulators.sh

start_simulator: start_sims

stop_sims:
	./vendor/kinetic-simulator/stopSimulators.sh
	./scripts/stopSimulators.sh

stop_simulator: stop_sims

+0 −5
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ passfile=./bin/systest/$1.testpass

rm -f $passfile > /dev/null

echo ================================================================================
echo Running system test: $test
echo ================================================================================
$test | tee $log
cat $log | tail -n 1 | grep -e "OK" &> /dev/null
if [[ $? -ne 0 ]]; then
@@ -25,5 +22,3 @@ if [[ $? -ne 0 ]]; then
else
    touch $passfile
fi
echo ================================================================================
echo
+1 −1
Original line number Diff line number Diff line
#! /usr/bin/env bash
BASE_DIR=`dirname "$0"`
BASE_DIR=`cd "$BASE_DIR"; pwd`
BASE_DIR=`cd "$BASE_DIR/../vendor/kinetic-simulator/"; pwd`

JAVA=""
if [ "$JAVA_HOME" != "" ]; then
+0 −22
Original line number Diff line number Diff line
require 'kinetic-ruby'


server = KineticRuby::Server.new(KineticRuby::DEFAULT_KINETIC_PORT)
puts "Kinetic Ruby Simulator waiting for a connection..."

trap("SIGINT") do
  puts
  puts "Shutting down..."
  server.shutdown
  exit 0
end

while(!server.connected) do
  sleep(0.25)
end
puts "Kinetic Ruby Simulator connected!"
while(server.connected)
  sleep(1)
end

Loading