Updated racket

frameworks/Racket/racket-ws/setup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-export RACKET_HOME=${IROOT}/racket
+
+fw_depends racket
 
 cd bench
-$RACKET_HOME/bin/racket -t bench.rkt -- ${DBHOST} &
+racket -t bench.rkt -- ${DBHOST} &

toolset/benchmark/benchmarker.py

@@ -948,7 +948,7 @@ class Benchmarker:
     # pprint(self.__dict__)
 
     self.start_time = time.time()
-    self.run_test_timeout_seconds = 3600
+    self.run_test_timeout_seconds = 7200
 
     # setup logging
     logging.basicConfig(stream=sys.stderr, level=logging.INFO)

toolset/benchmark/framework_test.py

@@ -269,7 +269,7 @@ class FrameworkTest:
       "%s: %s.sh and framework processes have terminated" % (self.name, self.setup_file))
 
     # Set a limit on total execution time of setup.sh
-    timeout = datetime.now() + timedelta(minutes = 30)
+    timeout = datetime.now() + timedelta(minutes = 105)
     time_remaining = timeout - datetime.now()
 
     # Need to print to stdout once every 10 minutes or Travis-CI will abort

toolset/setup/linux/languages/racket.sh

@@ -1,16 +1,21 @@
 #!/bin/bash
 
-RET=$(fw_exists ${IROOT}/racket.installed)
-if [ "$RET" == 0 ]; then 
-  return 0;
-fi
+RACKET=$IROOT/racket
+RETCODE=$(fw_exists ${RACKET}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  source $RACKET.installed
+  return 0; }
 
 fw_get http://mirror.racket-lang.org/installers/recent/racket-src.tgz -O racket-src.tar.gz
 fw_untar racket-src.tar.gz
 mv racket racket-install
 cd racket-install/src 
-./configure --prefix=${IROOT}/racket
+./configure --prefix=$RACKET
 make
 make install
 
-touch ${IROOT}/racket.installed
+echo "export RACKET_HOME=${RACKET}" > $RACKET.installed
+echo -e "export PATH=${RACKET}/bin:\$PATH" >> $RACKET.installed
+
+source $RACKET.installed