summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-22 02:10:02 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-22 02:11:04 +0300
commit613eefe4f1e7677ebb954c39d1ef1f579f56c0b7 (patch)
tree282a604c3e9c4bfa210f9856b28d592e3b7ad5e7 /sal
parent5c7e0a0c9c1dd9edc384b38d3bfe7a0ae2faf4e5 (diff)
Cannot do unit testing when cross-compiling
Diffstat (limited to 'sal')
-rw-r--r--sal/cppunittester/makefile.mk4
-rw-r--r--sal/qa/ByteSequence/makefile.mk4
-rw-r--r--sal/qa/OStringBuffer/makefile.mk4
-rw-r--r--sal/qa/makefile.mk4
-rw-r--r--sal/qa/osl/condition/makefile.mk5
-rw-r--r--sal/qa/osl/file/makefile.mk4
-rw-r--r--sal/qa/osl/getsystempathfromfileurl/makefile.mk4
-rw-r--r--sal/qa/osl/module/makefile.mk5
-rw-r--r--sal/qa/osl/process/makefile.mk4
-rwxr-xr-xsal/qa/osl/security/makefile.mk4
-rwxr-xr-xsal/qa/rtl/alloc/makefile.mk4
-rw-r--r--sal/qa/rtl/cipher/makefile.mk4
-rwxr-xr-xsal/qa/rtl/crc32/makefile.mk4
-rw-r--r--sal/qa/rtl/doublelock/makefile.mk4
-rw-r--r--sal/qa/rtl/locale/makefile.mk4
-rw-r--r--sal/qa/rtl/oustringbuffer/makefile.mk4
-rw-r--r--sal/qa/rtl/strings/makefile.mk3
-rw-r--r--sal/qa/sal/makefile.mk4
18 files changed, 71 insertions, 2 deletions
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 938b63d90ae9..77ed453fc94c 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGSCXX += $(CPPUNIT_CFLAGS)
OBJFILES = $(APP1OBJS)
@@ -42,4 +44,6 @@ APP1RPATH = NONE
APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
APP1TARGET = cppunittester
+.ENDIF
+
.INCLUDE: target.mk
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index b033e3194782..3ba99aa2fe4f 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF "$(CROSS_COMPILING)"==""
+
SHL1IMPLIB = i$(SHL1TARGET)
SHL1OBJS = $(SLO)/ByteSequence.obj
SHL1RPATH = NONE
@@ -45,5 +47,7 @@ DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
+.ENDIF
+
.INCLUDE: target.mk
.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index 2b29878ec20a..0a7386492a91 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -61,6 +63,8 @@ SHL1RPATH = NONE
# do this here, so we get right dependencies
SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/makefile.mk b/sal/qa/makefile.mk
index 391ac66b8ade..529b3bea4aef 100644
--- a/sal/qa/makefile.mk
+++ b/sal/qa/makefile.mk
@@ -47,6 +47,8 @@ TARGET=whole_sal_qa
ALLTAR : test_all
.ENDIF
+.IF "$(CROSS_COMPILING)"==""
+
# OTHER STUFF ------------------------------------------------------
# test : test_all
@@ -60,3 +62,5 @@ test_all:
@echo - start sal unit tests
@echo ----------------------------------------------------------
$(PERL) buildall.pl $(TESTOPT)
+
+.ENDIF
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 784f9c27a86e..5de9f0faa980 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -54,7 +56,10 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
# auto generated Target:Condition
# END ------------------------------------------------------------------
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
+
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index 1fad4b4d0125..ba7c3e574bd1 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -79,6 +81,8 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
# do this here, so we get right dependencies
SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/osl/getsystempathfromfileurl/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
index 295868e28d0a..1d68e93f96cc 100644
--- a/sal/qa/osl/getsystempathfromfileurl/makefile.mk
+++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
@@ -37,6 +37,8 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE =
@@ -51,6 +53,8 @@ DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
+.ENDIF
+
.INCLUDE: target.mk
.INCLUDE: _cppunit.mk
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index df444788ea07..474bf63e791b 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -72,8 +74,9 @@ DEF2NAME =$(SHL2TARGET)
SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
-
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index cf78cd5f5f6c..bec5e0e66206 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -77,6 +79,8 @@ SHL2DEPN=$(APP3TARGETN) \
SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index 9fc442fc1daa..c8c1bebe9f40 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -58,6 +60,8 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# auto generated Target:Security
# END ------------------------------------------------------------------
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 817554074ffc..15d3ff3f965c 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -54,6 +56,8 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# do this here, so we get right dependencies
# SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index ced0747acee5..7ba9b0b97f8a 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -37,6 +37,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -63,6 +65,8 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# do this here, so we get right dependencies
# SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 149e82eb81b7..7f748093c2d9 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -61,6 +63,8 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# do this here, so we get right dependencies
# SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 02283c9c1da0..85765dbd9fb9 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -64,6 +66,8 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 32e1471eecdf..1e757c640ebd 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -62,6 +64,8 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# do this here, so we get right dependencies
# SLOFILES=$(SHL1OBJS)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index 9165daa11350..dc82e6314fa1 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -34,6 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"==""
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -50,6 +51,7 @@ SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB)
SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
DEF1NAME := $(SHL1TARGET)
+.ENDIF
+
.INCLUDE: target.mk
.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
-
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index 2b07539e8683..6ebfed70251c 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -34,6 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"==""
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
@@ -51,5 +52,7 @@ SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB)
SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
DEF1NAME := $(SHL1TARGET)
+.ENDIF
+
.INCLUDE: target.mk
.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index e5ccce32b184..783b30138efe 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"==""
+
SHL1TARGET = $(TARGET)_types
SHL1OBJS = $(SLO)$/test_types.obj
SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)
@@ -42,5 +44,7 @@ DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
+.ENDIF
+
.INCLUDE: target.mk
.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
generated by cgit (git 2.34.1) at 2024-06-19 21:46:14 +0000