paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 00:29:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix testsuite hostname to not use -s option; solaris hostname interprets this as new hostname

Browse Source 
(in case of fqdn, cut off hostname ourself in Makefile)

git-svn-id: trunk@11385 -
This commit is contained in:
micha 2008-07-15 20:24:07 +00:00
parent acff7f60bd
commit e630556397
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/07/07]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/07/15]
#
default: allexectests
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -1361,10 +1361,7 @@ ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
unexport FPC_VERSION
TEST_HOSTNAME:=$(shell hostname -s)
ifeq ($(TEST_HOSTNAME),)
TEST_HOSTNAME:=$(shell hostname)
endif
TEST_HOSTNAME:=$(firstword $(subst ., ,$(shell hostname)))
override TEST_FPC:=$(subst \,/,$(TEST_FPC))
ifndef TEST_FPC
TEST_FPC=$(wildcard $(dir $(CURDIR))compiler/$(notdir $(FPC)))

5
tests/Makefile.fpc
View File

@ -16,10 +16,7 @@ unexport FPC_VERSION
# Test environment setup
#
TEST_HOSTNAME:=$(shell hostname -s)
ifeq ($(TEST_HOSTNAME),)
TEST_HOSTNAME:=$(shell hostname)
endif
TEST_HOSTNAME:=$(firstword $(subst ., ,$(shell hostname)))
override TEST_FPC:=$(subst \,/,$(TEST_FPC))