Simplify include analysis by enforcing the developer guide's include syntax #13230

   3 | @@ -4,10 +4,12 @@
   4 |  # Distributed under the MIT software license, see the accompanying
   5 |  # file COPYING or http://www.opensource.org/licenses/mit-license.php.
   6 |  #
   7 | -# Check for duplicate includes.
   8 | +# Check includes: Check for duplicate includes. Enforce bracket syntax includes.
   9 | +
  10 | +IGNORE_REGEXP="(leveldb|secp256k1|univalue)/"

Empact commented at 8:24 AM on May 14, 2018:

leading / missing

practicalswift commented at 8:36 AM on May 14, 2018:

Thanks! Fixed!

   0 | @@ -1,9 +1,9 @@
   1 |  #include <boost/test/unit_test.hpp>
   2 |  
   3 | -#include "stdlib.h"
   4 | +#include <stdlib.h>
   5 |  
   6 | -#include "rpc/blockchain.cpp"
   7 | -#include "test/test_bitcoin.h"
   8 | +#include <rpc/blockchain.cpp>

MarcoFalke commented at 4:56 PM on May 19, 2018:

Including a cpp file seems extremely wrong. (I know this is not your fault, just leaving a note)

Empact commented at 9:18 PM on May 20, 2018:

#13288

  99 | @@ -97,4 +100,12 @@ for EXPECTED_BOOST_INCLUDE in "${EXPECTED_BOOST_INCLUDES[@]}"; do
 100 |      fi
 101 |  done
 102 |  
 103 | +QUOTE_SYNTAX_INCLUDES=$(git grep '^#include "' -- "**/*.cpp" "**/*.h" | grep -Ev "${IGNORE_REGEXP}")

ken2812221 commented at 3:10 PM on June 5, 2018:

Why not use *.cpp and *.h? Isn't it compatible with other git versions?

practicalswift commented at 4:14 PM on June 5, 2018:

Yes, you're right that -- "*.cpp" "*.h" would be equivalent in this specific case (since we're only matching in src/), but my suggestions is that we keep this PR as is since it already has two utACK:s that would need re-reviewing in case of a change. Makes sense? :-)

practicalswift commented at 5:58 AM on June 6, 2018:

Fixed when rebasing :-)

   1 | @@ -2,11 +2,11 @@
   2 |  // Distributed under the MIT software license, see the accompanying
   3 |  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
   4 |  
   5 | -#include "bench.h"
   6 | +#include <bench.h>

laanwj commented at 6:06 PM on June 5, 2018:

This doesn't compile locally here. Should be #include <bench/bench.h>

practicalswift commented at 5:56 AM on June 6, 2018:

Fixed!

   0 | @@ -1,9 +1,9 @@
   1 |  #include <boost/test/unit_test.hpp>
   2 |  
   3 | -#include "stdlib.h"
   4 | +#include <stdlib.h>
   5 |  
   6 | -#include "rpc/blockchain.h"
   7 | -#include "test/test_bitcoin.h"
   8 | +#include <rpc/blockchain.cpp>

ken2812221 commented at 6:15 AM on June 6, 2018:

This seems incorrect

practicalswift commented at 7:25 AM on June 6, 2018:

In what way? :-)

ken2812221 commented at 7:37 AM on June 6, 2018:

It includes blockchain.h previously, but you include blockchain.cpp. Might because of #13288 merged.

practicalswift commented at 9:10 AM on June 6, 2018:

Ouch, now fixed! Thanks for catching this. I missed the .cpp extension!