From 8a60f39a144d34f188752832b13e910ee4ab114f Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 11 May 2018 16:11:27 +0000 Subject: [PATCH] Disable checking of default code page for cross-compilation configurations git-svn-id: trunk@38978 - --- tests/test/tcpstr19.pp | 2 ++ tests/test/tcpstr9.pp | 2 ++ tests/test/units/fpwidestring/tcpstr9fpwidestring.pp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/test/tcpstr19.pp b/tests/test/tcpstr19.pp index 79a002dcc6..30b7b44d9e 100644 --- a/tests/test/tcpstr19.pp +++ b/tests/test/tcpstr19.pp @@ -51,6 +51,8 @@ begin if StringCodePage(Copy(UTF8Encode('Test'), 1, 2)) <> CP_UTF8 then halt(3); R := 'Test'; +{$if not defined(FPC_CROSSCOMPILING) and not defined(FPC_CPUCROSSCOMPILING)} if StringCodePage(R) <> DefaultSystemCodePage then halt(4); +{$endif} end. diff --git a/tests/test/tcpstr9.pp b/tests/test/tcpstr9.pp index 74b78a1026..0450241ef0 100644 --- a/tests/test/tcpstr9.pp +++ b/tests/test/tcpstr9.pp @@ -36,11 +36,13 @@ uses begin // this test can be only run with the compiler built right now on the // same system +{$if not defined(FPC_CROSSCOMPILING) and not defined(FPC_CPUCROSSCOMPILING)} if StringCodePage(AnsiString('test')) <> DefaultSystemCodePage then begin WriteLn(StringCodePage(AnsiString('test')), ' <> ', DefaultSystemCodePage); halt(1); end; +{$endif} Writeln('ok'); end. diff --git a/tests/test/units/fpwidestring/tcpstr9fpwidestring.pp b/tests/test/units/fpwidestring/tcpstr9fpwidestring.pp index e09251f3ba..a25d03d67b 100644 --- a/tests/test/units/fpwidestring/tcpstr9fpwidestring.pp +++ b/tests/test/units/fpwidestring/tcpstr9fpwidestring.pp @@ -8,11 +8,13 @@ uses begin // this test can be only run with the compiler built right now on the // same system +{$if not defined(FPC_CROSSCOMPILING) and not defined(FPC_CPUCROSSCOMPILING)} if StringCodePage(AnsiString('test')) <> DefaultSystemCodePage then begin WriteLn(StringCodePage(AnsiString('test')), ' <> ', DefaultSystemCodePage); halt(1); end; +{$endif} Writeln('ok'); end.