From 6f47ae00aa3521af6e9e8e718f781c4a63414d89 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Wed, 23 Jan 2019 10:56:52 +0100 Subject: [PATCH] disable "Timeout" test by default, some LaunchAPPL backends can't abort programs --- AutomatedTests/CMakeLists.txt | 2 +- CMakeLists.txt | 4 ++-- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AutomatedTests/CMakeLists.txt b/AutomatedTests/CMakeLists.txt index c67482f3dd..eb8d468124 100644 --- a/AutomatedTests/CMakeLists.txt +++ b/AutomatedTests/CMakeLists.txt @@ -58,7 +58,7 @@ test(Empty.c) test(File.c PROPERTIES PASS_REGULAR_EXPRESSION "OK") -test(Timeout.c PROPERTIES PASS_REGULAR_EXPRESSION "One") +test(Timeout.c PROPERTIES PASS_REGULAR_EXPRESSION "One" DISABLED TRUE) test(Log.c PROPERTIES PASS_REGULAR_EXPRESSION "One\nTwo\nThree") diff --git a/CMakeLists.txt b/CMakeLists.txt index 736e2dc2a5..63306b7be2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012 Wolfgang Thaller. +# Copyright 2019 Wolfgang Thaller. # # This file is part of Retro68. # @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.9) project(Retro) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) diff --git a/README.md b/README.md index b25ca06ff6..1fa5f345b8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Installing/Building - Linux, Mac OS X or Windows (via Cygwin) - boost -- CMake 3.8 or later +- CMake 3.9 or later - GCC dependencies: GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+ - bison version 3.0.2 or later - Apple Universal Interfaces (version 3.x; version 3.4 is tested)