diff -r be27ed110b50 -r e1eecf4d390d sbsv2/raptor/lib/flm/test/flmtests.mk --- a/sbsv2/raptor/lib/flm/test/flmtests.mk Wed Oct 28 14:39:48 2009 +0000 +++ b/sbsv2/raptor/lib/flm/test/flmtests.mk Mon Nov 16 09:46:46 2009 +0000 @@ -1,35 +1,35 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# -## -# A grouping glue makefile that runs all tests - -## Purpose: Run test makefiles in parallel to ensure that they all work -## Postconditions: All postconditions for all the makefiles are satisfied - -#COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_1/exeabiv2_1.exe -#COMPONENT_GLUEMAKEFILES:=exeabiv2_1/exeabiv2_1.mk - -#COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_1/exeabiv2_1.exe $(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_2/exeabiv2_2.exe $(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_3/exeabiv2_3.exe $(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_4/exeabiv2_4.exe -#COMPONENT_GLUEMAKEFILES:=exeabiv2_1/exeabiv2_1.mk exeabiv2_2/exeabiv2_2.mk exeabiv2_3/exeabiv2_3.mk exeabiv2_4/exeabiv2_4.mk - - -#COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/nothing/nothing.mk -#COMPONENT_GLUEMAKEFILES:=nothing/nothing.mk - -COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/ciaabiv2_1 -COMPONENT_GLUEMAKEFILES:=ciaabiv2_1/ciaabiv2_1.mk - -include $(FLMHOME)/grouping.flm +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of the License "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +# A grouping glue makefile that runs all tests + +## Purpose: Run test makefiles in parallel to ensure that they all work +## Postconditions: All postconditions for all the makefiles are satisfied + +#COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_1/exeabiv2_1.exe +#COMPONENT_GLUEMAKEFILES:=exeabiv2_1/exeabiv2_1.mk + +#COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_1/exeabiv2_1.exe $(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_2/exeabiv2_2.exe $(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_3/exeabiv2_3.exe $(RELEASEPATH)/$(FULLVARIANTPATH)/exeabiv2_4/exeabiv2_4.exe +#COMPONENT_GLUEMAKEFILES:=exeabiv2_1/exeabiv2_1.mk exeabiv2_2/exeabiv2_2.mk exeabiv2_3/exeabiv2_3.mk exeabiv2_4/exeabiv2_4.mk + + +#COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/nothing/nothing.mk +#COMPONENT_GLUEMAKEFILES:=nothing/nothing.mk + +COMPONENT_ALLTARGETS:=$(RELEASEPATH)/$(FULLVARIANTPATH)/ciaabiv2_1 +COMPONENT_GLUEMAKEFILES:=ciaabiv2_1/ciaabiv2_1.mk + +include $(FLMHOME)/grouping.flm