Bug 888088 (part 5) - Fix #include ordering in js/src/jsapi-tests/. r=nnethercote.

--HG--
extra : rebase_source : 56497f40602cfe7af70cb8f439861a16f5608135

js/src/jsapi-tests/selfTest.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(selfTest_NaNsAreSame)

js/src/jsapi-tests/testAddPropertyPropcache.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 /* Do the test a bunch of times, because sometimes we seem to randomly

js/src/jsapi-tests/testArgumentsObject.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 #include "vm/Stack-inl.h"

js/src/jsapi-tests/testArrayBuffer.cpp

@@ -2,9 +2,10 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  */
 
-#include "jsapi-tests/tests.h"
 #include "jsfriendapi.h"
 
+#include "jsapi-tests/tests.h"
+
 #define NUM_TEST_BUFFERS 2
 #define MAGIC_VALUE_1 3
 #define MAGIC_VALUE_2 17

js/src/jsapi-tests/testBug604087.cpp

@@ -7,10 +7,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
 #include "jsobj.h"
 #include "jswrapper.h"
 
+#include "jsapi-tests/tests.h"
+
 #include "jsobjinlines.h"
 
 struct OuterWrapper : js::Wrapper

js/src/jsapi-tests/testClassGetter.cpp

@@ -7,7 +7,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 int called_test_fn;

js/src/jsapi-tests/testCloneScript.cpp

@@ -7,9 +7,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jsdbgapi.h"
 
 #include "jsapi-tests/tests.h"
-#include "jsdbgapi.h"
 
 BEGIN_TEST(test_cloneScript)
 {

js/src/jsapi-tests/testConservativeGC.cpp

@@ -4,8 +4,9 @@
 
 #if !defined(JSGC_ROOT_ANALYSIS) && !defined(JSGC_USE_EXACT_ROOTING)
 
-#include "jsapi-tests/tests.h"
 #include "jsobj.h"
+
+#include "jsapi-tests/tests.h"
 #include "vm/String.h"
 
 #include "jsobjinlines.h"

js/src/jsapi-tests/testCustomIterator.cpp

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-
 #include "jsclass.h"
 
+#include "jsapi-tests/tests.h"
+
 int count = 0;
 
 static JSBool

js/src/jsapi-tests/testDebugger.cpp

@@ -5,10 +5,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jscntxt.h"
+#include "jsdbgapi.h"
 
 #include "jsapi-tests/tests.h"
-#include "jsdbgapi.h"
-#include "jscntxt.h"
 
 static int callCount[2] = {0, 0};
 

js/src/jsapi-tests/testDeepFreeze.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testDeepFreeze_bug535703)

js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 static JSBool

js/src/jsapi-tests/testDefineProperty.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testDefineProperty_bug564344)

js/src/jsapi-tests/testEnclosingFunction.cpp

@@ -7,9 +7,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-#include "jsfriendapi.h"
 #include "jsdbgapi.h"
+#include "jsfriendapi.h"
+
+#include "jsapi-tests/tests.h"
 
 using namespace js;
 

js/src/jsapi-tests/testErrorCopying.cpp

@@ -8,9 +8,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jscntxt.h"
 
 #include "jsapi-tests/tests.h"
-#include "jscntxt.h"
 
 static uint32_t column = 0;
 

js/src/jsapi-tests/testException.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testException_bug860435)

js/src/jsapi-tests/testExternalStrings.cpp

@@ -5,10 +5,10 @@
 #include "mozilla/PodOperations.h"
 #include "mozilla/Util.h"
 
-#include "jsapi-tests/tests.h"
-
 #include "jsutil.h"
 
+#include "jsapi-tests/tests.h"
+
 using mozilla::ArrayLength;
 using mozilla::PodEqual;
 

js/src/jsapi-tests/testFindSCCs.cpp

@@ -5,16 +5,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
-#include "jsapi-tests/tests.h"
-
-#include <string.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "jscntxt.h"
 #include "jsgc.h"
 
 #include "gc/FindSCCs.h"
+#include "jsapi-tests/tests.h"
 
 static const unsigned MaxVertices = 10;
 

js/src/jsapi-tests/testFuncCallback.cpp

@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-#include "jsfun.h"
 #include "jscntxt.h"
+#include "jsfun.h"
+
+#include "jsapi-tests/tests.h"
 
 #ifdef MOZ_TRACE_JSCALLS
 

js/src/jsapi-tests/testFunctionProperties.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testFunctionProperties)

js/src/jsapi-tests/testGCFinalizeCallback.cpp

@@ -2,12 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-
 #include <stdarg.h>
 
-#include "jsfriendapi.h"
 #include "jscntxt.h"
+#include "jsfriendapi.h"
+
+#include "jsapi-tests/tests.h"
 
 #include "vm/ObjectImpl-inl.h"
 

js/src/jsapi-tests/testGCOutOfMemory.cpp

@@ -6,9 +6,10 @@
  * Contributor: Igor Bukanov
  */
 
-#include "jsapi-tests/tests.h"
 #include "jscntxt.h"
 
+#include "jsapi-tests/tests.h"
+
 static unsigned errorCount = 0;
 
 static void

js/src/jsapi-tests/testGetPropertyDefault.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 #define JSVAL_IS_FALSE(x) ((JSVAL_IS_BOOLEAN(x)) && !(JSVAL_TO_BOOLEAN(x)))

js/src/jsapi-tests/testHashTable.cpp

@@ -2,9 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-
 #include "js/HashTable.h"
+#include "jsapi-tests/tests.h"
 
 //#define FUZZ
 

js/src/jsapi-tests/testHashTableInit.cpp

@@ -2,9 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-
 #include "js/HashTable.h"
+#include "jsapi-tests/tests.h"
 
 typedef js::HashSet<uint32_t, js::DefaultHasher<uint32_t>, js::SystemAllocPolicy> IntSet;
 

js/src/jsapi-tests/testIndexToString.cpp

@@ -5,14 +5,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
-#include "jsapi-tests/tests.h"
-
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsnum.h"
 #include "jsstr.h"
 
+#include "jsapi-tests/tests.h"
+
 #include "vm/String-inl.h"
 
 using mozilla::ArrayLength;

js/src/jsapi-tests/testIntString.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 #include "vm/String.h"
 

js/src/jsapi-tests/testIntTypesABI.cpp

@@ -2,15 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-
 /*
  * This test exercises the full, deliberately-exposed JSAPI interface to ensure
  * that no internal integer typedefs leak out.  Include every intentionally
  * public header file (and those headers included by them, for completeness),
  * even the ones tests.h itself included, to verify this.
  */
-#include "js-config.h"
+
 #include "jsapi.h"
 #include "jsclass.h"
 #include "jscpucfg.h"
@@ -29,6 +27,7 @@
 #include "js/Utility.h"
 #include "js/Value.h"
 #include "js/Vector.h"
+#include "jsapi-tests/tests.h"
 
 /*
  * Verify that our public (and intended to be public, versus being that way

js/src/jsapi-tests/testIntern.cpp

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
 #include "jsatom.h"
 
 #include "gc/Marking.h"
+#include "jsapi-tests/tests.h"
 #include "vm/String.h"
 
 using mozilla::ArrayLength;

js/src/jsapi-tests/testLookup.cpp

@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jsfun.h"  // for js::IsInternalFunctionObject
 
 #include "jsapi-tests/tests.h"
-#include "jsfun.h"  // for js::IsInternalFunctionObject
 
 #include "jsobjinlines.h"
 

js/src/jsapi-tests/testLooselyEqual.cpp

@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
 #include <limits>
 #include <math.h>
 
+#include "jsapi-tests/tests.h"
+
 using namespace std;
 
 struct LooseEqualityFixture : public JSAPITest

js/src/jsapi-tests/testNewObject.cpp

@@ -5,11 +5,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jsfriendapi.h"
 
 #include "jsapi-tests/tests.h"
 
-#include "jsfriendapi.h"
-
 const size_t N = 1000;
 static jsval argv[N];
 

js/src/jsapi-tests/testOOM.cpp

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
-
 #include "mozilla/DebugOnly.h"
 
+#include "jsapi-tests/tests.h"
+
 BEGIN_TEST(testOOM)
 {
     JS::RootedString jsstr(cx, JS_ValueToString(cx, INT_TO_JSVAL(9)));

js/src/jsapi-tests/testOps.cpp

@@ -7,7 +7,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 static JSBool

js/src/jsapi-tests/testOriginPrincipals.cpp

@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
 #include "jsdbgapi.h"
 
+#include "jsapi-tests/tests.h"
+
 JSPrincipals *sOriginPrincipalsInErrorReporter = NULL;
 
 static void

js/src/jsapi-tests/testParseJSON.cpp

@@ -5,12 +5,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include <limits>
 #include <math.h>
 
-#include "jsapi-tests/tests.h"
 #include "jsstr.h"
+
+#include "jsapi-tests/tests.h"
 #include "vm/String.h"
 
 using namespace js;

js/src/jsapi-tests/testProfileStrings.cpp

@@ -7,11 +7,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jscntxt.h"
 
 #include "jsapi-tests/tests.h"
 
-#include "jscntxt.h"
-
 static js::ProfileEntry pstack[10];
 static uint32_t psize = 0;
 static uint32_t max_stack = 0;

js/src/jsapi-tests/testPropCache.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 static int g_counter;

js/src/jsapi-tests/testRegExpInstanceProperties.cpp

@@ -5,12 +5,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
-#include "jsapi-tests/tests.h"
-
 #include "jscompartment.h"
 #include "jsgc.h"
 
+#include "jsapi-tests/tests.h"
 #include "vm/Shape.h"
 
 #include "vm/Shape-inl.h"

js/src/jsapi-tests/testResolveRecursion.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 /*

js/src/jsapi-tests/testSameValue.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testSameValue)

js/src/jsapi-tests/testScriptInfo.cpp

@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jsdbgapi.h"
 
 #include "jsapi-tests/tests.h"
-#include "jsdbgapi.h"
 
 const char code[] =
     "xx = 1;       \n\

js/src/jsapi-tests/testScriptObject.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 struct ScriptObjectFixture : public JSAPITest {

js/src/jsapi-tests/testSetProperty.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 #include "jsapi-tests/tests.h"
 
 static JSBool

js/src/jsapi-tests/testSourcePolicy.cpp

@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
 #include "jsscript.h"
 
+#include "jsapi-tests/tests.h"
+
 BEGIN_TEST(testBug795104)
 {
     JS::CompileOptions opts(cx);

js/src/jsapi-tests/testStringBuffer.cpp

@@ -5,11 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
-#include "jsapi-tests/tests.h"
-
 #include "jsatom.h"
 
+#include "jsapi-tests/tests.h"
 #include "vm/StringBuffer.h"
 
 BEGIN_TEST(testStringBuffer_finishString)

js/src/jsapi-tests/testToIntWidth.cpp

@@ -5,11 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
-#include "jsapi-tests/tests.h"
-
 #include <math.h>
 
+#include "jsapi-tests/tests.h"
 #include "vm/NumericConversions.h"
 
 using js::detail::ToIntWidth;

js/src/jsapi-tests/testTrap.cpp

@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jsdbgapi.h"
 
 #include "jsapi-tests/tests.h"
-#include "jsdbgapi.h"
 
 static int emptyTrapCallCount = 0;
 

js/src/jsapi-tests/testTypedArrays.cpp

@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "jsfriendapi.h"
 
 #include "jsapi-tests/tests.h"
-#include "jsfriendapi.h"
 
 using namespace js;
 

js/src/jsapi-tests/testUTF8.cpp

@@ -5,10 +5,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
 #include "jsapi.h"
 #include "jsstr.h"
+
 #include "js/CharacterEncoding.h"
+#include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testUTF8_badUTF8)
 {

js/src/jsapi-tests/testXDR.cpp

@@ -4,10 +4,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsapi-tests/tests.h"
+#include "jsfriendapi.h"
 #include "jsscript.h"
 #include "jsstr.h"
-#include "jsfriendapi.h"
+
+#include "jsapi-tests/tests.h"
 
 #include "jsscriptinlines.h"
 

js/src/jsapi-tests/tests.cpp

@@ -5,10 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsapi-tests/tests.h"
-#include "js/RootingAPI.h"
-#include "jsobj.h"
+
 #include <stdio.h>
 
+#include "jsobj.h"
+
+#include "js/RootingAPI.h"
+
 JSAPITest *JSAPITest::list;
 
 bool JSAPITest::init()

js/src/jsapi-tests/tests.h

@@ -9,20 +9,18 @@
 
 #include "mozilla/Util.h"
 
-#include "jsapi.h"
-#include "jscntxt.h"
-#include "jsprvtd.h"
-#include "jsalloc.h"
-
-// For js::gc::AutoSuppressGC
-#include "jsgc.h"
-
-#include "js/Vector.h"
-
 #include <errno.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "jsalloc.h"
+#include "jsapi.h"
+#include "jscntxt.h"
+#include "jsgc.h"
+#include "jsprvtd.h"
+
+#include "js/Vector.h"
 
 /* Note: Aborts on OOM. */
 class JSAPITestString {