# HG changeset patch # User Jon Chatten # Date 1264696416 0 # Node ID 08ca0919c66d949ae60e94ca945b124a17c46522 # Parent eff54c65de8b27cc71b85142b6616ddee05a4bd2 First draft tests covering new dependency functionality. diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/basic_dependency.py --- a/sbsv2/raptor/test/smoke_suite/basic_dependency.py Tue Jan 26 14:25:28 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -# -# 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: -# - -from raptor_tests import SmokeTest -from raptor_meta import BldInfFile - -def run(): - result = SmokeTest.PASS - - t = SmokeTest() - t.id = "0098a" - t.name = "Build a component to begin with" - t.description = "Build a simple component" - t.usebash = True - t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf" - - t.targets = [ - "$(EPOCROOT)/epoc32/release/armv5/udeb/test.exe", - "$(EPOCROOT)/epoc32/release/armv5/udeb/test.exe.map", - "$(EPOCROOT)/epoc32/release/armv5/urel/test.exe", - "$(EPOCROOT)/epoc32/release/armv5/urel/test.exe.map", - "$(EPOCROOT)/epoc32/release/winscw/urel/test.exe", - "$(EPOCROOT)/epoc32/release/winscw/udeb/test.exe" - ] - t.run() - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - - # Ensure we don't clean up from the previous build in any subsequent runs - t = SmokeTest() - t.addbuildtargets('smoke_suite/test_resources/simple/bld.inf', []) - t.targets = [] - t.usebash = True - - t.id = "0098b" - t.name ="Touch a source file dependency and make sure thats the only one rebuilt" - t.description = "Touches one source file's dependency to check if its rebuilt" - t.command = """ - sleep 1 - touch smoke_suite/test_resources/simple/test.h - sbs -f - -b smoke_suite/test_resources/simple/bld.inf """ - # We should only recompile 1 source file, twice for armv5 and twice for winscw - t.countmatch = [ - [".*recipe name='compile'.*", 2], - [".*recipe name='win32compile2object'.*", 2] - ] - - t.run() - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - - # Invalidate the dependency file to make sure its not regenerated - t = SmokeTest() - # Ensure we don't clean up from the previous build in any subsequent runs - t.addbuildtargets('smoke_suite/test_resources/simple/bld.inf', []) - t.targets = [] - t.usebash = True - - t.id = "0098c" - t.name ="Invalidate the dependency file to make sure its not regenerated" - t.description = "Invalidate the dependency file to make sure its not regenerated" - fragment = BldInfFile.outputPathFragment('smoke_suite/test_resources/simple/Bld.inf') - t.command = """ - sleep 1 - touch smoke_suite/test_resources/simple/test.cpp - echo INVALIDATE_ARMV5_DEPENDENCY_FILE >> $(EPOCROOT)/epoc32/build/"""+ fragment + """/test_/armv5/urel/test.o.d - echo INVALIDATE_WINSCW_DEPENDENCY_FILE >> $(EPOCROOT)/epoc32/build/"""+ fragment + """/test_/winscw/urel/test.o.d - sbs -b smoke_suite/test_resources/simple/bld.inf -c armv5_urel -c winscw_urel - rm -rf $(EPOCROOT)/epoc32/build/"""+ fragment + """/test_/armv5/urel/test.o.d - rm -rf $(EPOCROOT)/epoc32/build/"""+ fragment + """/test_/winscw/urel/test.o.d""" - t.errors = 1 # We expect the build to fail since we messed up the dependency file - t.run() - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - - t.id = "98" - t.name = "basic_dependency" - t.result = result - t.print_result() - return t diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/dependencies.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/dependencies.py Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,164 @@ +# +# Copyright (c) 2010 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: +# + +from raptor_tests import AntiTargetSmokeTest +from raptor_meta import BldInfFile + +def run(): + t = AntiTargetSmokeTest() + t.usebash = True + + targets = [ + "$(EPOCROOT)/epoc32/release/armv5/udeb/dependency.exe", + "$(EPOCROOT)/epoc32/release/armv5/udeb/dependency.exe.map", + "$(EPOCROOT)/epoc32/release/armv5/urel/dependency.exe", + "$(EPOCROOT)/epoc32/release/armv5/urel/dependency.exe.map", + "$(EPOCROOT)/epoc32/release/winscw/urel/dependency.exe", + "$(EPOCROOT)/epoc32/release/winscw/urel/dependency.exe.map", + "$(EPOCROOT)/epoc32/release/winscw/udeb/dependency.exe", + "$(EPOCROOT)/epoc32/release/tools2/rel/dependency.exe", + "$(EPOCROOT)/epoc32/tools/dependency.exe", + "$(EPOCROOT)/epoc32/include/dependency.rsg", + "$(EPOCROOT)/epoc32/data/z/resource/apps/dependency.rsc", + "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/dependency.rsc", + "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/dependency.rsc", + "$(EPOCROOT)/epoc32/include/main.rsg", + "$(EPOCROOT)/epoc32/data/z/resource/apps/main.rsc", + "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/main.rsc", + "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/main.rsc" + ] + + t.id = "0098a" + t.name = "baseline_build" + t.description = "Build a component with source and resource files that are dependent on header files exported in the build" + t.command = """ + cp smoke_suite/test_resources/dependencies/src/dependency1.cpp smoke_suite/test_resources/dependencies/dependency.cpp + cp smoke_suite/test_resources/dependencies/src/dependency1.rss smoke_suite/test_resources/dependencies/dependency.rss + sbs -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel""" + t.targets = targets + t.mustnotmatch = [ + "Missing dependency detected: .*" + ] + t.run() + + # Ensure we don't clean up from the previous build in the following two tests + t.targets = [] + + # Core expected outcome for the following two tests + t.mustmatch = [ + ".*recipe name='compile' target='.*dependency\.o'", + ".*recipe name='win32compile2object' target='.*dependency\.o'", + ".*recipe name='compile2object' target='.*dependency\.o'", + ".*recipe name='resourcecompile' target='.*dependency\.rsc'" + ] + t.countmatch = [ + [".*recipe name='compile'", 2], + [".*recipe name='win32compile2object'", 2], + [".*recipe name='compile2object'", 1], + [".*recipe name='resourcecompile'", 1] + ] + + t.id = "0098b" + t.name ="touched_header_dependencies" + t.description = "Touch the exported header files and check that only the related source and resource files are re-built" + t.command = """ + sleep 1 + touch $(EPOCROOT)/epoc32/include/dependency.h + touch $(EPOCROOT)/epoc32/include/dependency.rh + sbs -f- -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel""" + t.run() + + t.id = "0098c" + t.name ="redundant_header_dependencies" + t.description = """ + Build the component again, but manipulate it so that (a) it no longer has a dependency on the exported header files and + (b) the header files have been removed and (c) the header files are no longer exported. Check that only the related source + and resource files are re-built""" + t.command = """ + cp smoke_suite/test_resources/dependencies/src/dependency2.cpp smoke_suite/test_resources/dependencies/dependency.cpp + cp smoke_suite/test_resources/dependencies/src/dependency2.rss smoke_suite/test_resources/dependencies/dependency.rss + rm -rf $(EPOCROOT)/epoc32/include/dependency.h + rm -rf $(EPOCROOT)/epoc32/include/dependency.rh + sbs -f- --noexport -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel""" + t.mustnotmatch = [] + t.mustmatch.extend([ + "Missing dependency detected: $(EPOCROOT)/epoc32/include/dependency.h", + "Missing dependency detected: $(EPOCROOT)/epoc32/include/dependency.rh", + ]) + t.run() + + t.id = "0098d" + t.name ="invalid_dependency_files" + t.description = "Invalidate dependency files, then make sure we can clean and re-build successfully" + buildLocation = "$(EPOCROOT)/epoc32/build/" + BldInfFile.outputPathFragment('smoke_suite/test_resources/dependencies/bld.inf') + "/dependency_" + t.command = """ + sleep 1 + touch smoke_suite/test_resources/dependencies/dependency.cpp + echo INVALIDATE_ARMV5_DEPENDENCY_FILE >> """+buildLocation+"""/armv5/urel/dependency.o.d + echo INVALIDATE_WINSCW_DEPENDENCY_FILE >> """+buildLocation+"""/winscw/urel/dependency.o.d + echo INVALIDATE_TOOLS2_DEPENDENCY_FILE >> """+buildLocation+"""/dependency_exe/tools2/rel/dependency.o.d + echo INVALIDATE_RESOURCE_DEPENDENCY_FILE >> """+buildLocation+"""/dependency__resource_apps_sc.rpp.d + sbs -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel + sbs -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel clean + sbs -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel""" + t.targets = targets + t.mustmatch = [] + t.countmatch = [] + t.errors = 1 # We expect an error from the first build due to the deliberate dependency file corruption + t.run() + + t.errors = 0 + + t.id = "0098e" + t.name ="no_depend_include" + t.description = "Invalidate dependency files in order to confirm they aren't processed when --no-depend-include is used" + buildLocation = "$(EPOCROOT)/epoc32/build/" + BldInfFile.outputPathFragment('smoke_suite/test_resources/dependencies/bld.inf') + "/dependency_" + t.command = """ + sleep 1 + touch smoke_suite/test_resources/dependencies/dependency.cpp + echo INVALIDATE_ARMV5_DEPENDENCY_FILE >> """+buildLocation+"""/armv5/urel/dependency.o.d + echo INVALIDATE_WINSCW_DEPENDENCY_FILE >> """+buildLocation+"""/winscw/urel/dependency.o.d + echo INVALIDATE_TOOLS2_DEPENDENCY_FILE >> """+buildLocation+"""/dependency_exe/tools2/rel/dependency.o.d + sbs --no-depend-include -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel""" + t.targets = targets + t.run() + + t.id = "0098f" + t.name ="no_depend_generate" + t.description = "Invalidate and remove dependency files in order to confirm they are neither included nor re-generated when --no-depend-generate is used" + buildLocation = "$(EPOCROOT)/epoc32/build/" + BldInfFile.outputPathFragment('smoke_suite/test_resources/dependencies/bld.inf') + "/dependency_" + t.command = """ + sleep 1 + touch smoke_suite/test_resources/dependencies/dependency.cpp + touch smoke_suite/test_resources/dependencies/main.cpp + echo INVALIDATE_ARMV5_DEPENDENCY_FILE >> """+buildLocation+"""/armv5/urel/dependency.o.d + echo INVALIDATE_WINSCW_DEPENDENCY_FILE >> """+buildLocation+"""/winscw/urel/dependency.o.d + echo INVALIDATE_TOOLS2_DEPENDENCY_FILE >> """+buildLocation+"""/dependency_exe/tools2/rel/dependency.o.d + sbs --no-depend-generate -b smoke_suite/test_resources/dependencies/bld.inf -c default -c tools2_rel""" + t.targets = targets + t.antitargets = [ + buildLocation+"/armv5/urel/main.o.d", + buildLocation+"/armv5/udeb/main.o.d", + buildLocation+"/winscw/urel/main.o.d", + buildLocation+"/winscw/udeb/main.o.d", + buildLocation+"/dependency_exe/tools2/rel/main.o.d" + ] + t.run() + + t.id = "98" + t.name = "dependencies" + t.print_result() + return t diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/bld.inf Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +PRJ_EXPORTS +inc/dependency.h +inc/dependency.rh + +PRJ_PLATFORMS +ARMV5 WINSCW TOOLS2 + +PRJ_MMPFILES +dependencies.mmp diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/dependencies.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/dependencies.mmp Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,41 @@ +/* +* Copyright (c) 2010 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: +* +* Test component that can build as a basic EXE for both OS and tools platforms +* +*/ + +TARGET dependency +TARGETTYPE exe +UID 0x100039ce 0x00000001 +SYSTEMINCLUDE /epoc32/include +SOURCE main.cpp +SOURCE dependency.cpp + +#ifndef TOOLS2 +SYSTEMINCLUDE /epoc32/include/techview + +START RESOURCE main.rss +HEADER +TARGETPATH /resource/apps +END + +START RESOURCE dependency.rss +HEADER +TARGETPATH /resource/apps +END + +LIBRARY euser.lib +#endif diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/inc/dependency.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/inc/dependency.h Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,18 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +#define DEPENDENCY_VALUE 1 diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/inc/dependency.rh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/inc/dependency.rh Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,18 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +#define DEPENDENCY_TEXT SomeText diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/main.cpp Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +#ifndef __TOOLS2__ +#include +TInt E32Main() +#else +int main(void) +#endif + { + return 0; + } diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/main.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/main.rss Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +NAME MAIN + +#include +#include +#include + +RESOURCE TBUF { buf=""; } +RESOURCE TBUF r_somestaticresource { buf="text"; } diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency1.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency1.cpp Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,20 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +#include + +int SomeVariable = DEPENDENCY_VALUE; diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency1.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency1.rss Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +NAME DEPE + +#include +#include +#include +#include + +RESOURCE TBUF { buf=""; } +RESOURCE TBUF r_someresource { buf="DEPENDENCY_TEXT"; } diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency2.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency2.cpp Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,18 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +int SomeVariable = 0; diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency2.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/dependencies/src/dependency2.rss Thu Jan 28 16:33:36 2010 +0000 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2010 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: +* +*/ + +NAME DEPE + +#include +#include +#include + +RESOURCE TBUF { buf=""; } +RESOURCE TBUF r_someresource { buf="SomeText"; } diff -r eff54c65de8b -r 08ca0919c66d sbsv2/raptor/test/unit_suite/raptor_cli_unit.py --- a/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Tue Jan 26 14:25:28 2010 +0000 +++ b/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Thu Jan 28 16:33:36 2010 +0000 @@ -14,7 +14,7 @@ # Description: # -1# Unit Test for the Raptor_cli (command line interface) module +# Unit Test for the Raptor_cli (command line interface) module import raptor_cli import sys @@ -42,6 +42,8 @@ self.allowCommandLineOverrides = True self.ignoreOsDetection = False self.filterList = "filter_terminal,filter_logfile" + self.noDependInclude = False + self.noDependGenerate = False def AddConfigName(self,configname): self.listconfig.append(configname) @@ -129,6 +131,9 @@ def SetNoDependInclude(self, yesOrNo): return True + + def SetNoDependGenerate(self, yesOrNo): + return True def SetJobs(self, N): return True @@ -187,7 +192,9 @@ '--export-only', '--source-target', 'some_source_file.cpp', '--source-target', 'some_resource_file.rss', - '--pp', 'on'] + '--pp', 'on', + '--no-depend-include', + '--no-depend-generate'] raptor_cli.GetArgs(self,args) self.assertEqual(self.RunningQuiet,False) @@ -206,6 +213,8 @@ self.assertEqual(self.targets[0], 'some_source_file.cpp') self.assertEqual(self.targets[1], 'some_resource_file.rss') self.assertEqual(self.pp, 'on') + self.assertEqual(self.noDependInclude, True) + self.assertEqual(self.noDependGenerate, True) # run all the tests