diff options
Diffstat (limited to 'testsuite/tests')
26 files changed, 32 insertions, 32 deletions
diff --git a/testsuite/tests/codeGen/should_run/T7600.hs b/testsuite/tests/codeGen/should_run/T7600.hs index 9f0e118b44..4193fdc33f 100644 --- a/testsuite/tests/codeGen/should_run/T7600.hs +++ b/testsuite/tests/codeGen/should_run/T7600.hs @@ -103,7 +103,7 @@ main = test_run float_number double_number -- in "0x" ++ str -- -- fixEndian :: [a] -> [a] --- -- #ifdef WORDS_BIGENDIAN +-- -- #if defined(WORDS_BIGENDIAN) -- -- fixEndian = id -- -- #else -- fixEndian = reverse diff --git a/testsuite/tests/codeGen/should_run/cgrun044.hs b/testsuite/tests/codeGen/should_run/cgrun044.hs index 17811f110a..f5f3939895 100644 --- a/testsuite/tests/codeGen/should_run/cgrun044.hs +++ b/testsuite/tests/codeGen/should_run/cgrun044.hs @@ -11,7 +11,7 @@ import Data.Array.ST #include "ghcconfig.h" reverse_if_bigendian :: [a] -> [a] -#ifdef WORDS_BIGENDIAN +#if defined(WORDS_BIGENDIAN) reverse_if_bigendian = reverse #else reverse_if_bigendian = id diff --git a/testsuite/tests/concurrent/should_run/conc036.hs b/testsuite/tests/concurrent/should_run/conc036.hs index 528649ce56..6bfee0336a 100644 --- a/testsuite/tests/concurrent/should_run/conc036.hs +++ b/testsuite/tests/concurrent/should_run/conc036.hs @@ -8,7 +8,7 @@ import Prelude hiding (catch) import Foreign import System.IO -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) sleep n = sleepBlock (n*1000) foreign import stdcall unsafe "Sleep" sleepBlock :: Int -> IO () #else diff --git a/testsuite/tests/concurrent/should_run/conc037.hs b/testsuite/tests/concurrent/should_run/conc037.hs index 7da76f5025..6f6d5e2d0a 100644 --- a/testsuite/tests/concurrent/should_run/conc037.hs +++ b/testsuite/tests/concurrent/should_run/conc037.hs @@ -4,7 +4,7 @@ module Main where import Control.Concurrent -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) foreign import stdcall safe "Sleep" _sleepBlock :: Int -> IO () sleepBlock n = _sleepBlock (n*1000) #else diff --git a/testsuite/tests/concurrent/should_run/conc038.hs b/testsuite/tests/concurrent/should_run/conc038.hs index e4489e1cf3..bf7fd6d261 100644 --- a/testsuite/tests/concurrent/should_run/conc038.hs +++ b/testsuite/tests/concurrent/should_run/conc038.hs @@ -10,7 +10,7 @@ haskellFun c = putStrLn ("Haskell: " ++ show c) foreign export ccall "hFun" haskellFun :: Int -> IO () foreign import ccall safe "hFun" hFun :: Int -> IO () -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) foreign import stdcall safe "Sleep" _sleepBlock :: Int -> IO () sleepBlock n = _sleepBlock (n*1000) #else diff --git a/testsuite/tests/concurrent/should_run/conc059.hs b/testsuite/tests/concurrent/should_run/conc059.hs index 148c0ba63d..86e202c9a2 100644 --- a/testsuite/tests/concurrent/should_run/conc059.hs +++ b/testsuite/tests/concurrent/should_run/conc059.hs @@ -18,7 +18,7 @@ f x = do foreign export ccall "f" f :: Int -> IO () -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) # if defined(i386_HOST_ARCH) # define WINDOWS_CCONV stdcall # elif defined(x86_64_HOST_ARCH) diff --git a/testsuite/tests/concurrent/should_run/foreignInterruptible.hs b/testsuite/tests/concurrent/should_run/foreignInterruptible.hs index 73585ec43b..6cd18388ed 100644 --- a/testsuite/tests/concurrent/should_run/foreignInterruptible.hs +++ b/testsuite/tests/concurrent/should_run/foreignInterruptible.hs @@ -6,7 +6,7 @@ import Control.Exception import Foreign import System.IO -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) sleep n = sleepBlock (n*1000) foreign import stdcall interruptible "Sleep" sleepBlock :: Int -> IO () #else diff --git a/testsuite/tests/driver/T11763.hs b/testsuite/tests/driver/T11763.hs index 3fd5df9fce..6fcb4b97b5 100644 --- a/testsuite/tests/driver/T11763.hs +++ b/testsuite/tests/driver/T11763.hs @@ -1,5 +1,5 @@ {-# LANGUAGE CPP #-} main = do -#ifndef VERSION_containers +#if !defined(VERSION_containers) putStrLn "OK" #endif diff --git a/testsuite/tests/driver/T2464.hs b/testsuite/tests/driver/T2464.hs index 6bee708e4b..84a7c03cca 100644 --- a/testsuite/tests/driver/T2464.hs +++ b/testsuite/tests/driver/T2464.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# OPTIONS_GHC -DTEST #-} {-# OPTIONS_GHC -fffi #-} -- deprecation warning -#ifdef TEST +#if defined(TEST) {-# LANGUAGE EmptyDataDecls #-} #endif diff --git a/testsuite/tests/ffi/should_compile/T11983.h b/testsuite/tests/ffi/should_compile/T11983.h index 33c78cb9a4..c4b0a2038c 100644 --- a/testsuite/tests/ffi/should_compile/T11983.h +++ b/testsuite/tests/ffi/should_compile/T11983.h @@ -1,4 +1,4 @@ -#ifndef T11983_H +#if !defined(T11983_H) #define T11983_H #include <stdint.h> diff --git a/testsuite/tests/ffi/should_run/capi_ctype_001.h b/testsuite/tests/ffi/should_run/capi_ctype_001.h index 11add5bf3d..a51f030aa7 100644 --- a/testsuite/tests/ffi/should_run/capi_ctype_001.h +++ b/testsuite/tests/ffi/should_run/capi_ctype_001.h @@ -1,5 +1,5 @@ -#ifndef __capi_ctype_001_H__ +#if !defined(__capi_ctype_001_H__) #define __capi_ctype_001_H__ typedef struct { diff --git a/testsuite/tests/ffi/should_run/capi_ctype_002_A.h b/testsuite/tests/ffi/should_run/capi_ctype_002_A.h index 26928a3436..e6b5dc0504 100644 --- a/testsuite/tests/ffi/should_run/capi_ctype_002_A.h +++ b/testsuite/tests/ffi/should_run/capi_ctype_002_A.h @@ -1,5 +1,5 @@ -#ifndef __capi_ctype_002_A_H__ +#if !defined(__capi_ctype_002_A_H__) #define __capi_ctype_002_A_H__ typedef struct { diff --git a/testsuite/tests/ffi/should_run/capi_ctype_002_B.h b/testsuite/tests/ffi/should_run/capi_ctype_002_B.h index 6928290f47..fb6cef8caf 100644 --- a/testsuite/tests/ffi/should_run/capi_ctype_002_B.h +++ b/testsuite/tests/ffi/should_run/capi_ctype_002_B.h @@ -1,5 +1,5 @@ -#ifndef __capi_ctype_002_B_H__ +#if !defined(__capi_ctype_002_B_H__) #define __capi_ctype_002_B_H__ #define f(p) p->j diff --git a/testsuite/tests/ffi/should_run/fptr01.h b/testsuite/tests/ffi/should_run/fptr01.h index b50cc41776..8862c9b9ce 100644 --- a/testsuite/tests/ffi/should_run/fptr01.h +++ b/testsuite/tests/ffi/should_run/fptr01.h @@ -1,4 +1,4 @@ -#ifndef FPTR01_H_INCLUDED +#if !defined(FPTR01_H_INCLUDED) #define FPTR01_H_INCLUDED void f( HsInt * ); diff --git a/testsuite/tests/ffi/should_run/fptrfail01.h b/testsuite/tests/ffi/should_run/fptrfail01.h index 3e10d8bd7a..a1611b300a 100644 --- a/testsuite/tests/ffi/should_run/fptrfail01.h +++ b/testsuite/tests/ffi/should_run/fptrfail01.h @@ -1,4 +1,4 @@ -#ifndef FPTRFAIL01_H_INCLUDED +#if !defined(FPTRFAIL01_H_INCLUDED) #define FPTRFAIL01_H_INCLUDED void f( HsInt * ); diff --git a/testsuite/tests/hsc2hs/T10272.h b/testsuite/tests/hsc2hs/T10272.h index 6d8142d909..1f3d724930 100644 --- a/testsuite/tests/hsc2hs/T10272.h +++ b/testsuite/tests/hsc2hs/T10272.h @@ -1,4 +1,4 @@ -#ifndef _T10272_H_ +#if !defined(_T10272_H_) #define _T10272_H_ #include <stdint.h> diff --git a/testsuite/tests/indexed-types/should_compile/T12538.hs b/testsuite/tests/indexed-types/should_compile/T12538.hs index 9aff36e47d..4347197486 100644 --- a/testsuite/tests/indexed-types/should_compile/T12538.hs +++ b/testsuite/tests/indexed-types/should_compile/T12538.hs @@ -20,7 +20,7 @@ class (r ~ Tag a) => TagImpl a r | a -> r where instance {-# OVERLAPPING #-} (r ~ Tag (Tagged t a)) => TagImpl (Tagged t a) r where tag = id -#ifdef WRONG +#if defined(WRONG) instance {-# OVERLAPPING #-} (r ~ Tagged t a, r ~ Tag a) => TagImpl a r where #else instance {-# OVERLAPPING #-} (r ~ Tagged Int a, r ~ Tag a) => TagImpl a r where diff --git a/testsuite/tests/rename/should_fail/T9032.hs b/testsuite/tests/rename/should_fail/T9032.hs index 0a00ba37b0..2b62aa21fb 100644 --- a/testsuite/tests/rename/should_fail/T9032.hs +++ b/testsuite/tests/rename/should_fail/T9032.hs @@ -2,7 +2,7 @@ module T9032 where -#ifdef ERR +#if defined(ERR) import T9032 #endif diff --git a/testsuite/tests/rts/T12031/foo.h b/testsuite/tests/rts/T12031/foo.h index d3ca4aad2d..ce205b2c73 100644 --- a/testsuite/tests/rts/T12031/foo.h +++ b/testsuite/tests/rts/T12031/foo.h @@ -1,6 +1,6 @@ // Copyright (c) 2016, Ryan Scott // foo.h -#ifndef FOO_H +#if !defined(FOO_H) #define FOO_H extern int foo; diff --git a/testsuite/tests/rts/spalign.c b/testsuite/tests/rts/spalign.c index 0b776e17cc..fe615eecbd 100644 --- a/testsuite/tests/rts/spalign.c +++ b/testsuite/tests/rts/spalign.c @@ -1,12 +1,12 @@ #include "Rts.h" -#ifdef darwin_HOST_OS +#if defined(darwin_HOST_OS) #define STG_GLOBAL ".globl " #else #define STG_GLOBAL ".global " #endif -#ifdef LEADING_UNDERSCORE +#if defined(LEADING_UNDERSCORE) #define GETESP "_getesp" #else #define GETESP "getesp" diff --git a/testsuite/tests/rts/testheapalloced.c b/testsuite/tests/rts/testheapalloced.c index a28079572a..240f787c14 100644 --- a/testsuite/tests/rts/testheapalloced.c +++ b/testsuite/tests/rts/testheapalloced.c @@ -1,10 +1,10 @@ #include "Rts.h" #include "RtsFlags.h" -#ifdef DEBUG +#if defined(DEBUG) #define INLINE_HEADER #endif #include "MBlock.h" -#ifdef DEBUG +#if defined(DEBUG) extern void *getFirstMBlock(void); extern void *getNextMBlock(void *mblock); #endif @@ -42,7 +42,7 @@ int main (int argc, char *argv[]) a[j] = allocGroup_lock(rand() % MAXALLOC + 1); } -#ifdef DEBUG +#if defined(DEBUG) { void *p; i = 0; diff --git a/testsuite/tests/rts/testwsdeque.c b/testsuite/tests/rts/testwsdeque.c index 0a2a64d78e..8d3a88cf57 100644 --- a/testsuite/tests/rts/testwsdeque.c +++ b/testsuite/tests/rts/testwsdeque.c @@ -18,7 +18,7 @@ OSThreadId ids[THREADS]; // ----------------------------------------------------------------------------- // version of stealWSDeque() that logs its actions, for debugging -#ifdef DEBUG +#if defined(DEBUG) #define BUF 128 @@ -128,7 +128,7 @@ void OSThreadProcAttr thief(void *info) n = (StgWord)info; while (!done) { -#ifdef DEBUG +#if defined(DEBUG) p = myStealWSDeque(q,n); #else p = stealWSDeque(q); @@ -163,7 +163,7 @@ int main(int argc, char*argv[]) pushWSDeque(q,&scratch[n]); } -#ifdef DEBUG +#if defined(DEBUG) debugBelch("main thread finished, popped %d", count); #endif exit(0); diff --git a/testsuite/tests/simplCore/T9646/cbits/primitive-memops.h b/testsuite/tests/simplCore/T9646/cbits/primitive-memops.h index 700ef05a8d..cfafbb4f6d 100644 --- a/testsuite/tests/simplCore/T9646/cbits/primitive-memops.h +++ b/testsuite/tests/simplCore/T9646/cbits/primitive-memops.h @@ -1,4 +1,4 @@ -#ifndef haskell_primitive_memops_h +#if !defined(haskell_primitive_memops_h) #define haskell_primitive_memops_h #include <stdlib.h> diff --git a/testsuite/tests/simplCore/should_compile/T8832.hs b/testsuite/tests/simplCore/should_compile/T8832.hs index db5e3a78b6..0cbff6976b 100644 --- a/testsuite/tests/simplCore/should_compile/T8832.hs +++ b/testsuite/tests/simplCore/should_compile/T8832.hs @@ -17,7 +17,7 @@ T(i,Int) T(i8,Int8) T(i16,Int16) T(i32,Int32) -#ifdef T8832_WORDSIZE_64 +#if defined(T8832_WORDSIZE_64) T(i64,Int64) #endif @@ -25,7 +25,7 @@ T(w,Word) T(w8,Word8) T(w16,Word16) T(w32,Word32) -#ifdef T8832_WORDSIZE_64 +#if defined(T8832_WORDSIZE_64) T(w64,Word64) #endif diff --git a/testsuite/tests/typecheck/should_run/T1735.hs b/testsuite/tests/typecheck/should_run/T1735.hs index 8a23c9effe..44dc54197a 100644 --- a/testsuite/tests/typecheck/should_run/T1735.hs +++ b/testsuite/tests/typecheck/should_run/T1735.hs @@ -41,7 +41,7 @@ mkMyListConstr = mkConstr myListDataType "MkMyList" [] Prefix myListDataType :: DataType myListDataType = mkDataType "MyList" [mkMyListConstr] -#ifdef FOO +#if defined(FOO) rigidTests :: Maybe (Maybe [YesNo]) rigidTests = mkTest [Elem "No" []] (Just [No]) diff --git a/testsuite/tests/typecheck/should_run/T1735_Help/Main.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Main.hs index 0c59d449fa..15dd583c6e 100644 --- a/testsuite/tests/typecheck/should_run/T1735_Help/Main.hs +++ b/testsuite/tests/typecheck/should_run/T1735_Help/Main.hs @@ -42,7 +42,7 @@ mkMyListConstr = mkConstr myListDataType "MkMyList" [] Prefix myListDataType :: DataType myListDataType = mkDataType "MyList" [mkMyListConstr] -#ifdef FOO +#if defined(FOO) rigidTests :: Maybe (Maybe [YesNo]) rigidTests = mkTest [Elem "No" []] (Just [No]) |