[tests,DeltaSettingsTest2] Fixes #333. Fix DeltaSettingsTest2 example on Linux.

Author: markfinal

Changelog.txt

@@ -1,3 +1,5 @@
+13-May-2017 Fixes #333. Fix DeltaSettingsTest2 example on Linux.
+
 13-May-2017 Fixes #332. Mingw assembler support now working. AssemblerTest1 example also now builds with Mingw.
 
 11-May-2017 ======== Version 1.1.1 beta 2 Release ========

tests/DeltaSettingsTest2/bam/DeltaSettingsTest2.xml

@@ -10,6 +10,7 @@
     <Package name="Clang" version="Xcode8" default="true" />
     <Package name="Gcc" version="4.8" default="true" />
     <Package name="Gcc" version="5.4" />
+    <Package name="MakeFileBuilder" />
     <Package name="NativeBuilder" />
     <Package name="VisualC" version="10.0" />
     <Package name="VisualC" version="11.0" />

tests/DeltaSettingsTest2/bam/Scripts/DeltaSettingsTest2.cs

@@ -57,6 +57,9 @@ protected override void
                     gccCompiler.AllWarnings = true;
                     gccCompiler.ExtraWarnings = true;
                     gccCompiler.Pedantic = true;
+
+                    var compiler = settings as C.ICommonCompilerSettings;
+                    compiler.DisableWarnings.AddUnique("long-long"); // DeltaSettingsTest2/source/main.c:37:10: error: ISO C90 does not support ‘long long’ [-Werror=long-long]
                 }
 
                 var clangCompiler = settings as ClangCommon.ICommonCompilerSettings;
@@ -66,7 +69,7 @@ protected override void
                     clangCompiler.ExtraWarnings = true;
                     clangCompiler.Pedantic = true;
 
-                    // this is intentionally common, as it's part of pedantic, which is disabled
+                    // this is intentionally common to all source, as it's part of pedantic, which is disabled
                     // for a specific file
                     // the issue arises for the other file and the order of this warning suppression
                     // and enabling 'pedantic' on the Xcode generated command line
@@ -83,6 +86,11 @@ protected override void
                         {
                             clangCompiler.Pedantic = false; // DeltaSettingsTest2/source/literal.c:35:9: error: string literal of length 510 exceeds maximum length 509 that C90 compilers are required to support [-Werror,-Woverlength-strings]
                         }
+                        var gccCompiler = settings as GccCommon.ICommonCompilerSettings;
+                        if (null != gccCompiler)
+                        {
+                            gccCompiler.Pedantic = false; // DeltaSettingsTest2/source/literal.c:35:9: error: string length ‘510’ is greater than the length ‘509’ ISO C90 compilers are required to support [-Werror=overlength-strings]
+                        }
                     }));
 
             if (this.Linker is VisualCCommon.LinkerBase)

tests/bamtests.py

@@ -109,8 +109,8 @@ def configure_repository():
                                               linux={"Native": [gcc64, gcc32], "MakeFile": [gcc64, gcc32]},
                                               osx={"Native": [clang64, clang32], "MakeFile": [clang64, clang32], "Xcode": [clang64, clang32]})
     configs["DeltaSettingsTest2"] = TestSetup(win={"Native": [visualc64, visualc32], "VSSolution": [visualc64, visualc32]},
-                                              linux={"Native": [gcc64, gcc32]},
-                                              osx={"Native": [clang64, clang32], "Xcode": [clang64, clang32]})
+                                              linux={"Native": [gcc64, gcc32], "MakeFile": [gcc64, gcc32]},
+                                              osx={"Native": [clang64, clang32], "MakeFile": [clang64, clang32], "Xcode": [clang64, clang32]})
     configs["AssemblerTest1"] = TestSetup(win={"Native": [visualc64, visualc32, mingw32], "VSSolution": [visualc64, visualc32]},
                                           linux={"Native": [gcc64, gcc32], "MakeFile": [gcc64, gcc32]},
                                           osx={"Native": [clang64, clang32], "MakeFile": [clang64, clang32], "Xcode": [clang64, clang32]})