Enhance enum checker to include meta header files

Signed-off-by: Tejaswini Chadaga <tchadaga@microsoft.com>

Author: tjchadaga

meta/ancestry.pl

@@ -127,13 +127,20 @@ sub ProcessHeaders
 {
     my $commit = shift;
 
-    my @headers = GetHeaderFiles("temp/commit-$commit/inc");
+    my @dirs = (
+        "temp/commit-$commit/inc",
+        "temp/commit-$commit/meta",
+    );
 
-    for my $header (@headers)
+    for my $dir (@dirs)
     {
-        LogDebug "Processing $header";
+        my @headers = GetHeaderFiles($dir);
 
-        ProcessSingleHeader "temp/commit-$commit/inc/$header";
+        for my $header (@headers)
+        {
+            LogDebug "Processing $dir/$header";
+            ProcessSingleHeader "$dir/$header";
+        }
     }
 }
 

meta/checkancestry.sh

@@ -84,8 +84,10 @@ function checkout_inc_directories()
 
         mkdir temp/commit-$commit
         mkdir temp/commit-$commit/inc
+        mkdir temp/commit-$commit/meta
 
         git --work-tree=temp/commit-$commit checkout $commit inc 2>/dev/null
+        git --work-tree=temp/commit-$commit checkout $commit meta 2>/dev/null
 
     done
 }
@@ -101,7 +103,12 @@ function create_commit_list()
 
     echo "git rev list from $begin to $end"
 
-    LIST=$(git rev-list --ancestry-path ${begin}^..${end} | xargs -n 1 git rev-parse --short | tac)
+    local skip_begin=$3
+    local skip_end=$4
+
+    local FULL_LIST=$(git rev-list --ancestry-path ${begin}^..${end} | xargs -n 1 git rev-parse --short | tac)
+    local SKIP_LIST=$(git rev-list --ancestry-path ${skip_begin}^..${skip_end} | xargs -n 1 git rev-parse --short | tac)
+    LIST=$(grep -vxFf <(echo "$SKIP_LIST") <<< "$FULL_LIST")
 }
 
 function check_enum_history()
@@ -123,11 +130,17 @@ function check_enum_history()
 
 BEGIN_COMMIT=3132018 # from this commit we are backward compatible
 BEGIN_COMMIT=1f2bca1 # to this commit we have history file
+
+# commits from skip_begin to skip_end are skipped from backward compatibility check
+# due to a regression in meta directory which was earlier excluded from this check
+SKIP_BEGIN=401bd1f
+SKIP_END=77578c8
+
 END_COMMIT=HEAD
 
 clean_temp_dir
 create_temp_dir
-create_commit_list $BEGIN_COMMIT $END_COMMIT
+create_commit_list $BEGIN_COMMIT $END_COMMIT $SKIP_BEGIN $SKIP_END
 checkout_inc_directories
 check_enum_history
 clean_temp_dir

meta/checkenumlock.sh

@@ -37,10 +37,14 @@ rm -rf $TEMP_DIR
 
 mkdir $TEMP_DIR
 
-git --work-tree=$TEMP_DIR/ checkout origin/master inc experimental
+git --work-tree=$TEMP_DIR/ checkout origin/master inc experimental meta
 
 echo "Checking for possible enum values shift (current branch vs origin/master) ..."
 
 ./checkheaders.pl -s ../inc/ $TEMP_DIR/inc/
 
+./checkheaders.pl -s ../meta/ $TEMP_DIR/meta/
+
+./checkheaders.pl -s ../experimental/ $TEMP_DIR/experimental/
+
 rm -rf $TEMP_DIR

meta/checkheaders.pl

@@ -104,6 +104,8 @@ sub GetEnums
 
     for my $file (@files)
     {
+        next if $file eq "saimetadata.h";
+
         my $data = ReadHeaderFile("$dir/$file");
 
         my %en = FilterEnums($data, "$dir/$file");
@@ -122,7 +124,21 @@ sub ConstructSource
 
     my $source = "#include <stdio.h>\n";
 
-    $source .= "#include \"$dir/sai.h\"\n";
+    $source .= "#include \"$dir/../inc/sai.h\"\n";
+
+    if( ! -e "$dir/sai.h") {
+
+        my @files = GetHeaderFiles $dir;
+
+        for my $file (@files)
+        {
+            if ($file =~ /\.h$/)
+            {
+                $source .= "#include \"$dir/$file\"\n";
+            }
+        }
+    }
+
     $source .="int main() { ";
 
     for my $en (sort keys %enums)
@@ -149,7 +165,7 @@ sub GetValues
 
     my ($fhb, $bin) = tempfile( SUFFIX => '.bin', UNLINK => 1  );
 
-    system("gcc $src -I. -I '$dir'/../experimental -I '$dir/../custom/' -I '$dir' -o $bin") == 0 or die "gcc failed! $!";
+    system("gcc $src -I. -I '$dir'/../experimental -I '$dir/../custom/' -I '$dir/../inc/' -I '$dir' -o $bin") == 0 or die "gcc failed! $!";
 
     close $fhs;
     close $fhb;