From c0533b0b0d88e574a6b2f901202404985ded08fd Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 19 Mar 2019 23:20:25 +0000 Subject: [PATCH] Install script mods: add git dependency and run make/test in subshell. --- prism/etc/scripts/prism-install-rhel | 6 ++---- prism/etc/scripts/prism-install-ubuntu | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/prism/etc/scripts/prism-install-rhel b/prism/etc/scripts/prism-install-rhel index 969e3965..76e1ab04 100755 --- a/prism/etc/scripts/prism-install-rhel +++ b/prism/etc/scripts/prism-install-rhel @@ -7,7 +7,7 @@ set -x # Print commands as they are executed # Install dependencies: make/gcc/Java sudo yum update -sudo yum -y install git gcc gcc-c++ java-1.8.0-openjdk-devel +sudo yum -y install git gcc gcc-c++ java-1.8.0-openjdk-devel git # Install Python (only needed for testing (prism-auto) currently) sudo yum -y install python @@ -17,6 +17,4 @@ git clone https://github.com/prismmodelchecker/prism.git # Compile PRISM and run a single test # (should ultimately display: "Testing result: PASS") -cd prism/prism -make -make test +(cd prism/prism && make && make test) diff --git a/prism/etc/scripts/prism-install-ubuntu b/prism/etc/scripts/prism-install-ubuntu index d13138a1..d94e428d 100755 --- a/prism/etc/scripts/prism-install-ubuntu +++ b/prism/etc/scripts/prism-install-ubuntu @@ -7,7 +7,7 @@ set -x # Print commands as they are executed # Install dependencies: make/gcc/Java sudo apt-get update -sudo apt -y install make gcc g++ default-jdk +sudo apt -y install make gcc g++ default-jdk git # Install Python (only needed for testing (prism-auto) currently) sudo apt -y install python @@ -17,6 +17,4 @@ git clone https://github.com/prismmodelchecker/prism.git # Compile PRISM and run a single test # (should ultimately display: "Testing result: PASS") -cd prism/prism -make -make test +(cd prism/prism && make && make test)