12 files changed, 55 insertions, 0 deletions
diff --git a/js/src/tests/style/BadIncludes.h b/js/src/tests/style/BadIncludes.h
new file mode 100644
index 0000000000..3af178a1d0
--- /dev/null
+++ b/js/src/tests/style/BadIncludes.h
@@ -0,0 +1,13 @@
+// Note:  the #if/#elif conditions are to get past the #include order checking.
+#if A
+#  include "tests/style/BadIncludes.h"   // bad: self-include
+#  include "tests/style/BadIncludes2.h"  // ok
+#elif B
+#  include "BadIncludes2.h"  // bad: not a full path
+#elif C
+#  include <tests/style/BadIncludes2.h>  // bad: <> form used for local file
+#elif D
+#  include "stdio.h"  // bad: "" form used for system file
+#elif E
+#  include "mozilla/Unused.h"  // bad: header is deprecated
+#endif
diff --git a/js/src/tests/style/BadIncludes2-inl.h b/js/src/tests/style/BadIncludes2-inl.h
new file mode 100644
index 0000000000..bc4f7729b8
--- /dev/null
+++ b/js/src/tests/style/BadIncludes2-inl.h
@@ -0,0 +1 @@
+// (this file is deliberately empty)
diff --git a/js/src/tests/style/BadIncludes2.h b/js/src/tests/style/BadIncludes2.h
new file mode 100644
index 0000000000..bc08f86639
--- /dev/null
+++ b/js/src/tests/style/BadIncludes2.h
@@ -0,0 +1 @@
+#include "tests/style/BadIncludes2-inl.h"  // bad: vanilla header #includes an inline-header
diff --git a/js/src/tests/style/BadIncludesOrder-inl.h b/js/src/tests/style/BadIncludesOrder-inl.h
new file mode 100644
index 0000000000..25a3c00d2d
--- /dev/null
+++ b/js/src/tests/style/BadIncludesOrder-inl.h
@@ -0,0 +1,30 @@
+// Note: Each #if scope gets checked separately.
+
+// These are in reverse order!
+#if A
+#  include "vm/JSScript-inl.h"
+#  include "vm/Interpreter-inl.h"
+#  include "js/Value.h"
+#  include "ds/LifoAlloc.h"
+#  include "jsapi.h"
+#  include <stdio.h>
+#  include "mozilla/HashFunctions.h"
+#endif
+
+// These are in reverse order, but it's ok due to the #if scopes.
+#if B
+#  include "vm/Interpreter-inl.h"
+#  if C
+#    include "js/Value.h"
+#    if D
+#      include "jsapi.h"
+#    endif
+#    include <stdio.h>
+#  endif
+#  include "mozilla/HashFunctions.h"
+#endif
+
+#include "jstypes.h"
+#include "vm/JSScript.h"  // out of order
+#include "vm/JSFunction.h"
+#include "vm/JSObject.h"
diff --git a/js/src/tests/style/HeaderCycleA1.h b/js/src/tests/style/HeaderCycleA1.h
new file mode 100644
index 0000000000..d70e08f01d
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleA1.h
@@ -0,0 +1 @@
+#include "tests/style/HeaderCycleA2.h"
diff --git a/js/src/tests/style/HeaderCycleA2.h b/js/src/tests/style/HeaderCycleA2.h
new file mode 100644
index 0000000000..d42dbe3d59
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleA2.h
@@ -0,0 +1 @@
+#include "tests/style/HeaderCycleA3.h"
diff --git a/js/src/tests/style/HeaderCycleA3.h b/js/src/tests/style/HeaderCycleA3.h
new file mode 100644
index 0000000000..01a72ecd82
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleA3.h
@@ -0,0 +1 @@
+#include "tests/style/HeaderCycleA1.h"
diff --git a/js/src/tests/style/HeaderCycleB1-inl.h b/js/src/tests/style/HeaderCycleB1-inl.h
new file mode 100644
index 0000000000..f89dc85304
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleB1-inl.h
@@ -0,0 +1 @@
+#include "tests/style/HeaderCycleB2-inl.h"
diff --git a/js/src/tests/style/HeaderCycleB2-inl.h b/js/src/tests/style/HeaderCycleB2-inl.h
new file mode 100644
index 0000000000..4ba0830474
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleB2-inl.h
@@ -0,0 +1,2 @@
+#include "tests/style/HeaderCycleB3-inl.h"
+#include "tests/style/HeaderCycleB4-inl.h"
diff --git a/js/src/tests/style/HeaderCycleB3-inl.h b/js/src/tests/style/HeaderCycleB3-inl.h
new file mode 100644
index 0000000000..9963b460cf
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleB3-inl.h
@@ -0,0 +1 @@
+#include "tests/style/HeaderCycleB4-inl.h"
diff --git a/js/src/tests/style/HeaderCycleB4-inl.h b/js/src/tests/style/HeaderCycleB4-inl.h
new file mode 100644
index 0000000000..23324c6762
--- /dev/null
+++ b/js/src/tests/style/HeaderCycleB4-inl.h
@@ -0,0 +1,2 @@
+#include "tests/style/jsheadercycleB5inlines.h"
+#include "tests/style/HeaderCycleB1-inl.h"
diff --git a/js/src/tests/style/jsheadercycleB5inlines.h b/js/src/tests/style/jsheadercycleB5inlines.h
new file mode 100644
index 0000000000..92a54cf535
--- /dev/null
+++ b/js/src/tests/style/jsheadercycleB5inlines.h
@@ -0,0 +1 @@
+#include "tests/style/HeaderCycleB1-inl.h"