Fix testcases incompatiblefunctiondeclaration etc to match cases needed

Author: knewbury01

c/common/test/rules/incompatiblefunctiondeclaration/IncompatibleFunctionDeclaration.expected

@@ -1,4 +1,4 @@
-| test1.c:4:12:4:12 | declaration of f | The object is not compatible with a re-declaration $@. | test.c:4:6:4:6 | definition of f | f |
-| test.c:4:6:4:6 | definition of f | The object is not compatible with a re-declaration $@. | test1.c:4:12:4:12 | declaration of f | f |
-| test.c:8:6:8:7 | declaration of f1 | The object is not compatible with a re-declaration $@. | test1.c:5:13:5:14 | declaration of f1 | f1 |
-| test.c:9:6:9:7 | definition of f2 | The object is not compatible with a re-declaration $@. | test1.c:6:6:6:7 | definition of f2 | f2 |
+| test1.c:1:12:1:12 | declaration of f | The object is not compatible with a re-declaration $@. | test.c:1:6:1:6 | definition of f | f |
+| test.c:1:6:1:6 | definition of f | The object is not compatible with a re-declaration $@. | test1.c:1:12:1:12 | declaration of f | f |
+| test.c:5:6:5:7 | declaration of f1 | The object is not compatible with a re-declaration $@. | test1.c:2:13:2:14 | declaration of f1 | f1 |
+| test.c:6:6:6:7 | definition of f2 | The object is not compatible with a re-declaration $@. | test1.c:3:6:3:7 | definition of f2 | f2 |

c/common/test/rules/incompatiblefunctiondeclaration/test.c

@@ -1,6 +1,3 @@
-short i;                // NON_COMPLIANT
-int a[] = {1, 2, 3, 4}; // NON_COMPLIANT
-
 long f(int a) { // NON_COMPLIANT
   return a * 2;
 }

c/common/test/rules/incompatiblefunctiondeclaration/test1.c

@@ -1,6 +1,3 @@
-extern int *a; // NON_COMPLIANT
-extern int i;  // NON_COMPLIANT
-
 extern int f(int a);   // NON_COMPLIANT
 extern void f1(int a); // NON_COMPLIANT
 void f2(int a, ...) {} // NON_COMPLIANT

c/common/test/rules/incompatibleobjectdeclaration/test.c

@@ -1,10 +1,2 @@
 short i;                // NON_COMPLIANT
-int a[] = {1, 2, 3, 4}; // NON_COMPLIANT
-
-long f(int a) { // NON_COMPLIANT
-  return a * 2;
-}
-
-void f1(long a); // NON_COMPLIANT
-void f2() {}     // NON_COMPLIANT
-int f3();        // COMPLIANT
+int a[] = {1, 2, 3, 4}; // NON_COMPLIANT

c/common/test/rules/incompatibleobjectdeclaration/test1.c

@@ -1,7 +1,2 @@
 extern int *a; // NON_COMPLIANT
-extern int i;  // NON_COMPLIANT
-
-extern int f(int a);   // NON_COMPLIANT
-extern void f1(int a); // NON_COMPLIANT
-void f2(int a, ...) {} // NON_COMPLIANT
-int f3();              // COMPLIANT
+extern int i;  // NON_COMPLIANT