From 9ba035e675cd76c2aeccc788372e6c8985887b76 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 4 Mar 2022 10:45:49 +0000 Subject: Normalise output of T10970 test The output of this test changes each time the containers submodule version updates. It's easier to apply the version normaliser so that the test checks that there is a version number, but not which one it is. --- testsuite/tests/driver/T10970.hs | 2 +- testsuite/tests/driver/T10970.stdout | 2 +- testsuite/tests/driver/all.T | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testsuite/tests/driver/T10970.hs b/testsuite/tests/driver/T10970.hs index 9de4f80650..a3eb5b757d 100644 --- a/testsuite/tests/driver/T10970.hs +++ b/testsuite/tests/driver/T10970.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} main = do - putStrLn VERSION_containers + putStrLn ("containers-" ++ VERSION_containers) #if MIN_VERSION_base(3,0,0) putStrLn "OK" #endif diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout index fe7705777b..fc87bc6c9e 100644 --- a/testsuite/tests/driver/T10970.stdout +++ b/testsuite/tests/driver/T10970.stdout @@ -1,2 +1,2 @@ -0.6.5.1 +containers-0.6.5.1 OK diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index af81d61eb8..07a6ec8c74 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -231,7 +231,7 @@ test('T365', test('T9360a', req_interp, run_command, ['{compiler} --interactive -e "" -ignore-dot-ghci']) test('T9360b', req_interp, run_command, ['{compiler} -e "" --interactive -ignore-dot-ghci']) -test('T10970', normal, compile_and_run, ['']) +test('T10970', [normalise_version('containers')], compile_and_run, ['']) test('T4931', normal, compile_and_run, ['']) test('T11182', normal, compile_and_run, ['']) test('T11381', normal, compile_fail, ['']) -- cgit v1.2.1