summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroctachron <octa@polychoron.fr>2021-02-09 14:43:01 +0100
committeroctachron <octa@polychoron.fr>2021-03-15 15:25:03 +0100
commita7f80409d6e07db51a0ccbc059cd43993905a512 (patch)
treeb7be8479055704b1322a3d2f7e2fbebf21382d8a
parent357654891e3412805f50912b15c7047cfae3264c (diff)
downloadocaml-a7f80409d6e07db51a0ccbc059cd43993905a512.tar.gz
stop using single letter in warning settings
- Replace -w A with -w +A in various makefiles and tests. - Replace -w a with -w -a in tests. - Replace -w Ae with -w +A -w -fragile-matching
-rw-r--r--Makefile2
-rw-r--r--debugger/Makefile2
-rw-r--r--lex/Makefile2
-rw-r--r--ocamldoc/Makefile2
-rw-r--r--ocamltest/Makefile2
-rw-r--r--otherlibs/Makefile.otherlibs.common2
-rw-r--r--otherlibs/dynlink/Makefile2
-rw-r--r--otherlibs/systhreads/Makefile2
-rwxr-xr-xstdlib/Compflags6
-rw-r--r--stdlib/Makefile2
-rw-r--r--testsuite/tests/ast-invariants/test.ml2
-rw-r--r--testsuite/tests/gc-roots/globroots.ml2
-rw-r--r--testsuite/tests/lib-digest/md5.ml2
-rw-r--r--testsuite/tests/lib-unix/win-env/test_env.ml2
-rw-r--r--testsuite/tests/output-complete-obj/github9344.ml2
-rw-r--r--testsuite/tests/output-complete-obj/test.ml4
-rw-r--r--testsuite/tests/output-complete-obj/test2.ml2
-rw-r--r--testsuite/tests/runtime-errors/stackoverflow.ml2
-rw-r--r--testsuite/tests/runtime-errors/syserror.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t000.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t010-const0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t010-const1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t010-const2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t010-const3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t011-constint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t020.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t021-pushconst1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t021-pushconst2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t021-pushconst3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t022-pushconstint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t040-makeblock1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t040-makeblock2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t040-makeblock3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t041-makeblock.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t050-getglobal.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t050-pushgetglobal.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t051-getglobalfield.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t060-raise.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t070-branch.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t070-branchif.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t070-branchifnot.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t071-boolnot.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t080-eq.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t080-geint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t080-gtint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t080-leint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t080-ltint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t080-neq.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc5.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc6.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc7.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t091-acc.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc5.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc6.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc7.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t093-pushacc.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t100-pushtrap.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t101-poptrap.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-addint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-andint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-asrint-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-asrint-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-divint-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-divint-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-divint-3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-lslint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-lsrint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-modint-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-modint-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-mulint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-negint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-offsetint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-orint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-subint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t110-xorint.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t120-getstringchar.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t121-setstringchar.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t130-getvectitem.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t130-vectlength.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t131-setvectitem.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t141-switch-5.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t141-switch-6.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t141-switch-7.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t142-switch-8.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t142-switch-9.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t142-switch-A.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t150-push-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t150-push-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t160-closure.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t161-apply1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t162-return.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t163.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t164-apply2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t164-apply3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t165-apply.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t170-envacc2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t170-envacc3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t170-envacc4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t171-envacc.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t173-pushenvacc.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t180-appterm1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t180-appterm2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t180-appterm3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t181-appterm.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t191-vectlength.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t201-getfield.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t211-setfield.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t220-assign.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t230-check_signals.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call5.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t250-closurerec-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t250-closurerec-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t253-offsetclosure0.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t253-offsetclosure2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t254-offsetclosure.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t260-offsetref.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t270-push_retaddr.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t300-getmethod.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t301-object.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t310-alloc-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t310-alloc-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t320-gc-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t320-gc-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t320-gc-3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-2.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-3.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-4.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t340-weak.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t350-heapcheck.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t360-stacks-1.ml2
-rw-r--r--testsuite/tests/tool-ocaml/t360-stacks-2.ml2
-rw-r--r--testsuite/tests/tool-ocamlc-error-cleanup/test.ml4
-rw-r--r--testsuite/tests/typing-fstclassmod/fstclassmod.ml2
-rw-r--r--testsuite/tests/typing-misc-bugs/core_array_reduced_ok.ml2
-rw-r--r--testsuite/tests/typing-misc-bugs/pr6303_bad.ml2
-rw-r--r--testsuite/tests/typing-misc-bugs/pr6946_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/gatien_baron_20131019_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr5164_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr51_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr5663_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr5914_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6240_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6293_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6427_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6485_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6513_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6572_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6651_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6752_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6752_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6899_first_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6899_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6899_second_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6944_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6954_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6981_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6982_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6985_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr6992_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7036_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7082_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7112_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7112_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7152_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7182_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7305_principal.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7321_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7414_2_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7414_bad.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7519_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7601_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr7601a_ok.ml2
-rw-r--r--testsuite/tests/typing-modules-bugs/pr9695_bad.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr3968_bad.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr4018_bad.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr4435_bad.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr4766_ok.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr4824_ok.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr4824a_bad.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr5156_ok.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr7284_bad.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/pr7293_ok.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/woodyatt_ok.ml2
-rw-r--r--testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml2
-rw-r--r--testsuite/tests/typing-poly-bugs/pr5322_ok.ml2
-rw-r--r--testsuite/tests/typing-poly-bugs/pr5673_ok.ml2
-rw-r--r--testsuite/tests/typing-poly-bugs/pr6922_ok.ml2
-rw-r--r--testsuite/tests/typing-polyvariants-bugs/pr4775_ok.ml2
-rw-r--r--testsuite/tests/typing-polyvariants-bugs/pr4933_ok.ml2
-rw-r--r--testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml2
-rw-r--r--testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml2
-rw-r--r--testsuite/tests/typing-polyvariants-bugs/pr7199_ok.ml2
-rw-r--r--testsuite/tests/typing-polyvariants-bugs/privrowsabate_ok.ml2
-rw-r--r--testsuite/tests/typing-private-bugs/pr5026_bad.ml2
-rw-r--r--testsuite/tests/typing-private-bugs/pr5469_ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t01bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t02bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t03ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t04bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t05bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t06ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t07bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t08bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t09bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t10ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t11bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t12bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t13ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t14bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t15bad.ml2
-rw-r--r--testsuite/tests/typing-recmod/t16ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t17ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t18ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t20ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t21ok.ml2
-rw-r--r--testsuite/tests/typing-recmod/t22ok.ml2
-rw-r--r--testsuite/tests/typing-rectypes-bugs/pr5343_bad.ml2
-rw-r--r--testsuite/tests/typing-rectypes-bugs/pr6174_bad.ml2
-rw-r--r--testsuite/tests/typing-rectypes-bugs/pr6870_bad.ml2
-rw-r--r--testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml2
-rw-r--r--testsuite/tests/typing-warnings/application.ml2
-rw-r--r--testsuite/tests/typing-warnings/coercions.ml2
-rw-r--r--testsuite/tests/typing-warnings/exhaustiveness.ml2
-rw-r--r--testsuite/tests/typing-warnings/open_warnings.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr5892.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr6587.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr6872.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr7085.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr7115.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr7261.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr7297.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr7553.ml2
-rw-r--r--testsuite/tests/typing-warnings/pr9244.ml2
-rw-r--r--testsuite/tests/typing-warnings/records.ml2
-rw-r--r--testsuite/tests/typing-warnings/unused_functor_parameter.ml2
-rw-r--r--testsuite/tests/typing-warnings/unused_types.ml2
-rw-r--r--testsuite/tests/warnings/deprecated_module.ml2
-rw-r--r--testsuite/tests/warnings/deprecated_module_assigment.ml2
-rw-r--r--testsuite/tests/warnings/deprecated_module_use.ml4
-rw-r--r--testsuite/tests/warnings/w01.ml2
-rw-r--r--testsuite/tests/warnings/w03.ml2
-rw-r--r--testsuite/tests/warnings/w04.ml2
-rw-r--r--testsuite/tests/warnings/w04_failure.ml2
-rw-r--r--testsuite/tests/warnings/w06.ml2
-rw-r--r--testsuite/tests/warnings/w32.ml2
-rw-r--r--testsuite/tests/warnings/w32b.ml2
-rw-r--r--testsuite/tests/warnings/w33.ml2
-rw-r--r--testsuite/tests/warnings/w45.ml2
-rw-r--r--testsuite/tests/warnings/w47_inline.ml2
-rw-r--r--testsuite/tests/warnings/w50.ml2
-rw-r--r--testsuite/tests/warnings/w51.ml2
-rw-r--r--testsuite/tests/warnings/w51_bis.ml2
-rw-r--r--testsuite/tests/warnings/w52.ml2
-rw-r--r--testsuite/tests/warnings/w53.ml2
-rw-r--r--testsuite/tests/warnings/w54.ml2
-rw-r--r--testsuite/tests/warnings/w55.ml2
-rw-r--r--testsuite/tests/warnings/w58.ml2
-rw-r--r--testsuite/tests/warnings/w59.ml2
-rw-r--r--testsuite/tests/warnings/w60.ml2
-rw-r--r--testsuite/tests/warnings/w68.ml2
-rw-r--r--testsuite/tests/win-unicode/mltest.ml2
-rw-r--r--tools/Makefile2
307 files changed, 312 insertions, 312 deletions
diff --git a/Makefile b/Makefile
index fe76592396..b81cd5b401 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ INCLUDES=-I utils -I parsing -I typing -I bytecomp -I file_formats \
-I driver -I toplevel
COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
- -warn-error A \
+ -warn-error +a \
-bin-annot -safe-string -strict-formats $(INCLUDES)
LINKFLAGS=
diff --git a/debugger/Makefile b/debugger/Makefile
index 50695f2b05..f94784f7e1 100644
--- a/debugger/Makefile
+++ b/debugger/Makefile
@@ -22,7 +22,7 @@ DYNLINKDIR=$(ROOTDIR)/otherlibs/dynlink
UNIXDIR=$(ROOTDIR)/otherlibs/$(UNIXLIB)
CAMLC=$(BEST_OCAMLC) -g -nostdlib -I $(ROOTDIR)/stdlib
-COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error +A \
-safe-string -strict-sequence -strict-formats
LINKFLAGS=-linkall -I $(UNIXDIR) -I $(DYNLINKDIR)
OCAMLLEX ?= $(BEST_OCAMLLEX)
diff --git a/lex/Makefile b/lex/Makefile
index 43ce59faa5..01f3ffa12c 100644
--- a/lex/Makefile
+++ b/lex/Makefile
@@ -24,7 +24,7 @@ OCAMLYACCFLAGS = -v
CAMLC = $(BOOT_OCAMLC) -strict-sequence -nostdlib \
-I $(ROOTDIR)/boot -use-prims $(ROOTDIR)/runtime/primitives
CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) -nostdlib -I $(ROOTDIR)/stdlib
-COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error +A \
-safe-string -strict-sequence -strict-formats -bin-annot
LINKFLAGS =
OCAMLLEX ?= $(BOOT_OCAMLLEX)
diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
index 92e2af7ffe..1159673359 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
@@ -75,7 +75,7 @@ INCLUDES_NODEP=\
DEPINCLUDES=$(INCLUDES_DEP)
INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODEP)
-COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error +A \
-safe-string -strict-sequence -strict-formats -bin-annot -principal
LINKFLAGS=$(INCLUDES) -nostdlib
diff --git a/ocamltest/Makefile b/ocamltest/Makefile
index ef8566fcd7..1a80f721a9 100644
--- a/ocamltest/Makefile
+++ b/ocamltest/Makefile
@@ -190,7 +190,7 @@ include_directories := $(addprefix -I , $(directories))
flags := -g -nostdlib $(include_directories) \
-strict-sequence -safe-string -strict-formats \
- -w +a-4-9-41-42-44-45-48 -warn-error A
+ -w +a-4-9-41-42-44-45-48 -warn-error +A
ocamlc = $(BEST_OCAMLC) $(flags)
diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common
index fe49d08dd1..7fd69e8189 100644
--- a/otherlibs/Makefile.otherlibs.common
+++ b/otherlibs/Makefile.otherlibs.common
@@ -30,7 +30,7 @@ OC_CFLAGS += $(SHAREDLIB_CFLAGS) $(EXTRACFLAGS)
OC_CPPFLAGS += -I$(ROOTDIR)/runtime $(EXTRACPPFLAGS)
# Compilation options
-COMPFLAGS=-absname -w +a-4-9-41-42-44-45-48 -warn-error A -bin-annot -g \
+COMPFLAGS=-absname -w +a-4-9-41-42-44-45-48 -warn-error +A -bin-annot -g \
-safe-string -strict-sequence -strict-formats $(EXTRACAMLFLAGS)
ifeq "$(FLAMBDA)" "true"
OPTCOMPFLAGS += -O3
diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile
index 69b680980d..40f4938316 100644
--- a/otherlibs/dynlink/Makefile
+++ b/otherlibs/dynlink/Makefile
@@ -29,7 +29,7 @@ OCAMLOPT=$(BEST_OCAMLOPT) -g -nostdlib -I $(ROOTDIR)/stdlib
# COMPFLAGS should be in sync with the toplevel Makefile's COMPFLAGS.
COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
- -warn-error A \
+ -warn-error +A \
-bin-annot -safe-string -strict-formats
ifeq "$(FLAMBDA)" "true"
OPTCOMPFLAGS += -O3
diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
index b6a46c438e..9e0a534d68 100644
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -35,7 +35,7 @@ CAMLC=$(BEST_OCAMLC) $(LIBS)
CAMLOPT=$(BEST_OCAMLOPT) $(LIBS)
MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib$(EXE)
-COMPFLAGS=-w +33..39 -warn-error A -g -bin-annot -safe-string
+COMPFLAGS=-w +33..39 -warn-error +A -g -bin-annot -safe-string
ifeq "$(FLAMBDA)" "true"
OPTCOMPFLAGS += -O3
endif
diff --git a/stdlib/Compflags b/stdlib/Compflags
index 9cd5478128..7341bf4930 100755
--- a/stdlib/Compflags
+++ b/stdlib/Compflags
@@ -27,10 +27,10 @@ case $1 in
# never instrument camlinternalOO or camlinternalLazy (PR#7725)
stdlib__Buffer.cmx) echo ' -inline 3';;
# make sure add_char is inlined (PR#5872)
- stdlib__Buffer.cm[io]) echo ' -w A';;
- camlinternalFormat.cm[io]) echo ' -w Ae';;
+ stdlib__Buffer.cm[io]) echo ' -w +A';;
+ camlinternalFormat.cm[io]) echo ' -w +A -w -fragile-match';;
stdlib__Printf.cm[io]|stdlib__Format.cm[io]|stdlib__Scanf.cm[io])
- echo ' -w Ae';;
+ echo ' -w +A -w -fragile-match';;
stdlib__Scanf.cmx) echo ' -inline 9';;
*Labels.cmi) echo ' -pp "$AWK -f ./expand_module_aliases.awk"';;
*Labels.cm[ox]) echo ' -nolabels -no-alias-deps';;
diff --git a/stdlib/Makefile b/stdlib/Makefile
index d69e12165f..5f69f20fc2 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -22,7 +22,7 @@ TARGET_BINDIR ?= $(BINDIR)
COMPILER=$(ROOTDIR)/ocamlc$(EXE)
CAMLC=$(CAMLRUN) $(COMPILER)
COMPFLAGS=-strict-sequence -absname -w +a-4-9-41-42-44-45-48 \
- -g -warn-error A -bin-annot -nostdlib -principal \
+ -g -warn-error +A -bin-annot -nostdlib -principal \
-safe-string -strict-formats
ifeq "$(FLAMBDA)" "true"
OPTCOMPFLAGS += -O3
diff --git a/testsuite/tests/ast-invariants/test.ml b/testsuite/tests/ast-invariants/test.ml
index 314c668b9e..b5dbd1cbbb 100644
--- a/testsuite/tests/ast-invariants/test.ml
+++ b/testsuite/tests/ast-invariants/test.ml
@@ -30,7 +30,7 @@ let invariants : type a. a kind -> a -> unit = function
| Interf -> Ast_invariants.signature
let check_file kind fn =
- Warnings.parse_options false "-a";
+ ignore (Warnings.parse_options false "-a");
let ic = open_in fn in
Location.input_name := fn;
let lexbuf = Lexing.from_channel ic in
diff --git a/testsuite/tests/gc-roots/globroots.ml b/testsuite/tests/gc-roots/globroots.ml
index 43d93e3f73..3363eba3b4 100644
--- a/testsuite/tests/gc-roots/globroots.ml
+++ b/testsuite/tests/gc-roots/globroots.ml
@@ -1,5 +1,5 @@
(* TEST
- flags += " -w a "
+ flags += " -w -a "
modules = "globrootsprim.c"
*)
diff --git a/testsuite/tests/lib-digest/md5.ml b/testsuite/tests/lib-digest/md5.ml
index 4c686df669..d66ba52257 100644
--- a/testsuite/tests/lib-digest/md5.ml
+++ b/testsuite/tests/lib-digest/md5.ml
@@ -1,5 +1,5 @@
(* TEST
- flags += " -w a "
+ flags += " -w -a "
*)
(* Test int32 arithmetic and optimizations using the MD5 algorithm *)
diff --git a/testsuite/tests/lib-unix/win-env/test_env.ml b/testsuite/tests/lib-unix/win-env/test_env.ml
index 45a96b82fa..2f0dc818a5 100644
--- a/testsuite/tests/lib-unix/win-env/test_env.ml
+++ b/testsuite/tests/lib-unix/win-env/test_env.ml
@@ -1,6 +1,6 @@
(* TEST
include unix
-flags += "-strict-sequence -safe-string -w A -warn-error A"
+flags += "-strict-sequence -safe-string -w +A -warn-error +A"
modules = "stubs.c"
* libwin32unix
** bytecode
diff --git a/testsuite/tests/output-complete-obj/github9344.ml b/testsuite/tests/output-complete-obj/github9344.ml
index 430e5ec808..b7ea5c5ec6 100644
--- a/testsuite/tests/output-complete-obj/github9344.ml
+++ b/testsuite/tests/output-complete-obj/github9344.ml
@@ -4,7 +4,7 @@ use_runtime = "false"
* setup-ocamlc.byte-build-env
** ocamlc.byte
-flags = "-w a -output-complete-exe -ccopt -I${ocamlsrcdir}/runtime"
+flags = "-w -a -output-complete-exe -ccopt -I${ocamlsrcdir}/runtime"
program = "github9344"
*** run
program = "sh ${test_source_directory}/github9344.sh"
diff --git a/testsuite/tests/output-complete-obj/test.ml b/testsuite/tests/output-complete-obj/test.ml
index 4dd3135532..8f6ff18ce3 100644
--- a/testsuite/tests/output-complete-obj/test.ml
+++ b/testsuite/tests/output-complete-obj/test.ml
@@ -5,7 +5,7 @@ files = "test.ml_stub.c"
* libunix
** setup-ocamlc.byte-build-env
*** ocamlc.byte
-flags = "-w a -output-complete-obj"
+flags = "-w -a -output-complete-obj"
program = "test.ml.bc.${objext}"
**** script
script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_bc_stub.exe \
@@ -17,7 +17,7 @@ stdout = "program-output"
stderr = "program-output"
** setup-ocamlopt.byte-build-env
*** ocamlopt.byte
-flags = "-w a -output-complete-obj"
+flags = "-w -a -output-complete-obj"
program = "test.ml.exe.${objext}"
**** script
script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_stub.exe \
diff --git a/testsuite/tests/output-complete-obj/test2.ml b/testsuite/tests/output-complete-obj/test2.ml
index bee3d38268..d071ec3089 100644
--- a/testsuite/tests/output-complete-obj/test2.ml
+++ b/testsuite/tests/output-complete-obj/test2.ml
@@ -7,7 +7,7 @@ use_runtime = "false"
include unix
** setup-ocamlc.byte-build-env
*** ocamlc.byte
-flags = "-w a -output-complete-exe puts.c -ccopt -I${ocamlsrcdir}/runtime"
+flags = "-w -a -output-complete-exe puts.c -ccopt -I${ocamlsrcdir}/runtime"
program = "test2"
**** run
program = "./test2"
diff --git a/testsuite/tests/runtime-errors/stackoverflow.ml b/testsuite/tests/runtime-errors/stackoverflow.ml
index 82c1c25ac8..0ec46ef61e 100644
--- a/testsuite/tests/runtime-errors/stackoverflow.ml
+++ b/testsuite/tests/runtime-errors/stackoverflow.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w a"
+flags = "-w -a"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/runtime-errors/syserror.ml b/testsuite/tests/runtime-errors/syserror.ml
index 39818a21f2..d5230ad7cf 100644
--- a/testsuite/tests/runtime-errors/syserror.ml
+++ b/testsuite/tests/runtime-errors/syserror.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w a"
+flags = "-w -a"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/tool-ocaml/t000.ml b/testsuite/tests/tool-ocaml/t000.ml
index 87deb62f5e..a8413fb10f 100644
--- a/testsuite/tests/tool-ocaml/t000.ml
+++ b/testsuite/tests/tool-ocaml/t000.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t010-const0.ml b/testsuite/tests/tool-ocaml/t010-const0.ml
index b1592185d1..6216683396 100644
--- a/testsuite/tests/tool-ocaml/t010-const0.ml
+++ b/testsuite/tests/tool-ocaml/t010-const0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t010-const1.ml b/testsuite/tests/tool-ocaml/t010-const1.ml
index 83629d71fd..a536453d00 100644
--- a/testsuite/tests/tool-ocaml/t010-const1.ml
+++ b/testsuite/tests/tool-ocaml/t010-const1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t010-const2.ml b/testsuite/tests/tool-ocaml/t010-const2.ml
index 8b467ddd4e..7f06a72513 100644
--- a/testsuite/tests/tool-ocaml/t010-const2.ml
+++ b/testsuite/tests/tool-ocaml/t010-const2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t010-const3.ml b/testsuite/tests/tool-ocaml/t010-const3.ml
index 68340da7b4..92ed01b9a8 100644
--- a/testsuite/tests/tool-ocaml/t010-const3.ml
+++ b/testsuite/tests/tool-ocaml/t010-const3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t011-constint.ml b/testsuite/tests/tool-ocaml/t011-constint.ml
index 08dc080268..26a6f1efe3 100644
--- a/testsuite/tests/tool-ocaml/t011-constint.ml
+++ b/testsuite/tests/tool-ocaml/t011-constint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t020.ml b/testsuite/tests/tool-ocaml/t020.ml
index 3eb1a723f2..3d3c3ff8dc 100644
--- a/testsuite/tests/tool-ocaml/t020.ml
+++ b/testsuite/tests/tool-ocaml/t020.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t021-pushconst1.ml b/testsuite/tests/tool-ocaml/t021-pushconst1.ml
index 576e9dddbd..d315d23dba 100644
--- a/testsuite/tests/tool-ocaml/t021-pushconst1.ml
+++ b/testsuite/tests/tool-ocaml/t021-pushconst1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t021-pushconst2.ml b/testsuite/tests/tool-ocaml/t021-pushconst2.ml
index e876901bd8..df2d22c30a 100644
--- a/testsuite/tests/tool-ocaml/t021-pushconst2.ml
+++ b/testsuite/tests/tool-ocaml/t021-pushconst2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t021-pushconst3.ml b/testsuite/tests/tool-ocaml/t021-pushconst3.ml
index eda9799a41..c07111e952 100644
--- a/testsuite/tests/tool-ocaml/t021-pushconst3.ml
+++ b/testsuite/tests/tool-ocaml/t021-pushconst3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t022-pushconstint.ml b/testsuite/tests/tool-ocaml/t022-pushconstint.ml
index fc7ac9e1e2..bdb708d2e9 100644
--- a/testsuite/tests/tool-ocaml/t022-pushconstint.ml
+++ b/testsuite/tests/tool-ocaml/t022-pushconstint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t040-makeblock1.ml b/testsuite/tests/tool-ocaml/t040-makeblock1.ml
index 1fd566892f..1c52df3085 100644
--- a/testsuite/tests/tool-ocaml/t040-makeblock1.ml
+++ b/testsuite/tests/tool-ocaml/t040-makeblock1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t040-makeblock2.ml b/testsuite/tests/tool-ocaml/t040-makeblock2.ml
index e33bd036b0..e96a8b67cd 100644
--- a/testsuite/tests/tool-ocaml/t040-makeblock2.ml
+++ b/testsuite/tests/tool-ocaml/t040-makeblock2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t040-makeblock3.ml b/testsuite/tests/tool-ocaml/t040-makeblock3.ml
index 1af62b8e30..a2083304ef 100644
--- a/testsuite/tests/tool-ocaml/t040-makeblock3.ml
+++ b/testsuite/tests/tool-ocaml/t040-makeblock3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t041-makeblock.ml b/testsuite/tests/tool-ocaml/t041-makeblock.ml
index db9004fb3d..8d70bb630b 100644
--- a/testsuite/tests/tool-ocaml/t041-makeblock.ml
+++ b/testsuite/tests/tool-ocaml/t041-makeblock.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t050-getglobal.ml b/testsuite/tests/tool-ocaml/t050-getglobal.ml
index 1dc0f6b3b2..cbd7ee1ad8 100644
--- a/testsuite/tests/tool-ocaml/t050-getglobal.ml
+++ b/testsuite/tests/tool-ocaml/t050-getglobal.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml b/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml
index ddb5858a39..e112327967 100644
--- a/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml
+++ b/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t051-getglobalfield.ml b/testsuite/tests/tool-ocaml/t051-getglobalfield.ml
index afbb1a3156..a78a5e8e46 100644
--- a/testsuite/tests/tool-ocaml/t051-getglobalfield.ml
+++ b/testsuite/tests/tool-ocaml/t051-getglobalfield.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml b/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml
index 4268118660..26c1e0d1b7 100644
--- a/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml
+++ b/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t060-raise.ml b/testsuite/tests/tool-ocaml/t060-raise.ml
index b212348ea6..1bee8b2d20 100644
--- a/testsuite/tests/tool-ocaml/t060-raise.ml
+++ b/testsuite/tests/tool-ocaml/t060-raise.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
ocaml_exit_status = "2"
* setup-ocaml-build-env
diff --git a/testsuite/tests/tool-ocaml/t070-branch.ml b/testsuite/tests/tool-ocaml/t070-branch.ml
index e2de0da31f..8a58e20e8c 100644
--- a/testsuite/tests/tool-ocaml/t070-branch.ml
+++ b/testsuite/tests/tool-ocaml/t070-branch.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t070-branchif.ml b/testsuite/tests/tool-ocaml/t070-branchif.ml
index 6e96a036c5..a231f04110 100644
--- a/testsuite/tests/tool-ocaml/t070-branchif.ml
+++ b/testsuite/tests/tool-ocaml/t070-branchif.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t070-branchifnot.ml b/testsuite/tests/tool-ocaml/t070-branchifnot.ml
index 90949503ff..578380b1f1 100644
--- a/testsuite/tests/tool-ocaml/t070-branchifnot.ml
+++ b/testsuite/tests/tool-ocaml/t070-branchifnot.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t071-boolnot.ml b/testsuite/tests/tool-ocaml/t071-boolnot.ml
index 50e1c737a0..3400655bff 100644
--- a/testsuite/tests/tool-ocaml/t071-boolnot.ml
+++ b/testsuite/tests/tool-ocaml/t071-boolnot.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t080-eq.ml b/testsuite/tests/tool-ocaml/t080-eq.ml
index d9c335dbe3..b8fc6455c3 100644
--- a/testsuite/tests/tool-ocaml/t080-eq.ml
+++ b/testsuite/tests/tool-ocaml/t080-eq.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t080-geint.ml b/testsuite/tests/tool-ocaml/t080-geint.ml
index 3eb3d25791..d604fed654 100644
--- a/testsuite/tests/tool-ocaml/t080-geint.ml
+++ b/testsuite/tests/tool-ocaml/t080-geint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t080-gtint.ml b/testsuite/tests/tool-ocaml/t080-gtint.ml
index 5099b21d9e..df53f75199 100644
--- a/testsuite/tests/tool-ocaml/t080-gtint.ml
+++ b/testsuite/tests/tool-ocaml/t080-gtint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t080-leint.ml b/testsuite/tests/tool-ocaml/t080-leint.ml
index b6a8891978..b78aa3a5db 100644
--- a/testsuite/tests/tool-ocaml/t080-leint.ml
+++ b/testsuite/tests/tool-ocaml/t080-leint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t080-ltint.ml b/testsuite/tests/tool-ocaml/t080-ltint.ml
index b7f376e69e..9737ad1a33 100644
--- a/testsuite/tests/tool-ocaml/t080-ltint.ml
+++ b/testsuite/tests/tool-ocaml/t080-ltint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t080-neq.ml b/testsuite/tests/tool-ocaml/t080-neq.ml
index ed219d65bb..b1c33aec21 100644
--- a/testsuite/tests/tool-ocaml/t080-neq.ml
+++ b/testsuite/tests/tool-ocaml/t080-neq.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc0.ml b/testsuite/tests/tool-ocaml/t090-acc0.ml
index 5bbebdd703..0b398c26ea 100644
--- a/testsuite/tests/tool-ocaml/t090-acc0.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc1.ml b/testsuite/tests/tool-ocaml/t090-acc1.ml
index da9b877254..8a4dcd1711 100644
--- a/testsuite/tests/tool-ocaml/t090-acc1.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc2.ml b/testsuite/tests/tool-ocaml/t090-acc2.ml
index 48ba4d4e4e..708da881fe 100644
--- a/testsuite/tests/tool-ocaml/t090-acc2.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc3.ml b/testsuite/tests/tool-ocaml/t090-acc3.ml
index 6d40d55746..9474236d43 100644
--- a/testsuite/tests/tool-ocaml/t090-acc3.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc4.ml b/testsuite/tests/tool-ocaml/t090-acc4.ml
index 32fd2a1cdf..673694d059 100644
--- a/testsuite/tests/tool-ocaml/t090-acc4.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc5.ml b/testsuite/tests/tool-ocaml/t090-acc5.ml
index 657d8701ca..f270f5fc17 100644
--- a/testsuite/tests/tool-ocaml/t090-acc5.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc5.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc6.ml b/testsuite/tests/tool-ocaml/t090-acc6.ml
index a6cfd26f75..b1d0e83303 100644
--- a/testsuite/tests/tool-ocaml/t090-acc6.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc6.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t090-acc7.ml b/testsuite/tests/tool-ocaml/t090-acc7.ml
index 03b67ecce9..64e61e791b 100644
--- a/testsuite/tests/tool-ocaml/t090-acc7.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc7.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t091-acc.ml b/testsuite/tests/tool-ocaml/t091-acc.ml
index 57c17dfcee..be3c73ebca 100644
--- a/testsuite/tests/tool-ocaml/t091-acc.ml
+++ b/testsuite/tests/tool-ocaml/t091-acc.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc.ml b/testsuite/tests/tool-ocaml/t092-pushacc.ml
index 4cff5cfb6b..26a414b3b5 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc0.ml b/testsuite/tests/tool-ocaml/t092-pushacc0.ml
index 3108757a6c..7199799b90 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc0.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc1.ml b/testsuite/tests/tool-ocaml/t092-pushacc1.ml
index 5cd5f7604e..d6e34cee03 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc1.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc2.ml b/testsuite/tests/tool-ocaml/t092-pushacc2.ml
index 290c8cd619..2f1b641bab 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc2.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc3.ml b/testsuite/tests/tool-ocaml/t092-pushacc3.ml
index 28309d712b..c0bc7fcd99 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc3.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc4.ml b/testsuite/tests/tool-ocaml/t092-pushacc4.ml
index 4ea3d8476f..07dd054eee 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc4.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc5.ml b/testsuite/tests/tool-ocaml/t092-pushacc5.ml
index f6b063f432..57c6213e5f 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc5.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc5.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc6.ml b/testsuite/tests/tool-ocaml/t092-pushacc6.ml
index 0e1e6368f0..01304d6a66 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc6.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc6.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc7.ml b/testsuite/tests/tool-ocaml/t092-pushacc7.ml
index 4c057cc580..befef4c2f6 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc7.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc7.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t093-pushacc.ml b/testsuite/tests/tool-ocaml/t093-pushacc.ml
index c072dc0790..efd8d8d8d9 100644
--- a/testsuite/tests/tool-ocaml/t093-pushacc.ml
+++ b/testsuite/tests/tool-ocaml/t093-pushacc.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t100-pushtrap.ml b/testsuite/tests/tool-ocaml/t100-pushtrap.ml
index d5f06b6f10..586e720d01 100644
--- a/testsuite/tests/tool-ocaml/t100-pushtrap.ml
+++ b/testsuite/tests/tool-ocaml/t100-pushtrap.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t101-poptrap.ml b/testsuite/tests/tool-ocaml/t101-poptrap.ml
index 42b84c608f..842ec08962 100644
--- a/testsuite/tests/tool-ocaml/t101-poptrap.ml
+++ b/testsuite/tests/tool-ocaml/t101-poptrap.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-addint.ml b/testsuite/tests/tool-ocaml/t110-addint.ml
index c3733cb864..cc31dc6166 100644
--- a/testsuite/tests/tool-ocaml/t110-addint.ml
+++ b/testsuite/tests/tool-ocaml/t110-addint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-andint.ml b/testsuite/tests/tool-ocaml/t110-andint.ml
index 5f92f9a25f..52497d319c 100644
--- a/testsuite/tests/tool-ocaml/t110-andint.ml
+++ b/testsuite/tests/tool-ocaml/t110-andint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-asrint-1.ml b/testsuite/tests/tool-ocaml/t110-asrint-1.ml
index a86d85c454..fe700edc29 100644
--- a/testsuite/tests/tool-ocaml/t110-asrint-1.ml
+++ b/testsuite/tests/tool-ocaml/t110-asrint-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-asrint-2.ml b/testsuite/tests/tool-ocaml/t110-asrint-2.ml
index a028d36c9f..9f15bde01f 100644
--- a/testsuite/tests/tool-ocaml/t110-asrint-2.ml
+++ b/testsuite/tests/tool-ocaml/t110-asrint-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-divint-1.ml b/testsuite/tests/tool-ocaml/t110-divint-1.ml
index 3c5cfb6423..0e1208abe1 100644
--- a/testsuite/tests/tool-ocaml/t110-divint-1.ml
+++ b/testsuite/tests/tool-ocaml/t110-divint-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-divint-2.ml b/testsuite/tests/tool-ocaml/t110-divint-2.ml
index b2cc299462..eabec84efd 100644
--- a/testsuite/tests/tool-ocaml/t110-divint-2.ml
+++ b/testsuite/tests/tool-ocaml/t110-divint-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-divint-3.ml b/testsuite/tests/tool-ocaml/t110-divint-3.ml
index e6a6913ce4..d17e1350a0 100644
--- a/testsuite/tests/tool-ocaml/t110-divint-3.ml
+++ b/testsuite/tests/tool-ocaml/t110-divint-3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-lslint.ml b/testsuite/tests/tool-ocaml/t110-lslint.ml
index b39a2c92bb..fc903ef8fe 100644
--- a/testsuite/tests/tool-ocaml/t110-lslint.ml
+++ b/testsuite/tests/tool-ocaml/t110-lslint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-lsrint.ml b/testsuite/tests/tool-ocaml/t110-lsrint.ml
index 619aedda26..348a2b6a3e 100644
--- a/testsuite/tests/tool-ocaml/t110-lsrint.ml
+++ b/testsuite/tests/tool-ocaml/t110-lsrint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-modint-1.ml b/testsuite/tests/tool-ocaml/t110-modint-1.ml
index 528ffa5482..0bfb65defa 100644
--- a/testsuite/tests/tool-ocaml/t110-modint-1.ml
+++ b/testsuite/tests/tool-ocaml/t110-modint-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-modint-2.ml b/testsuite/tests/tool-ocaml/t110-modint-2.ml
index 2614175053..e2ea7c29a8 100644
--- a/testsuite/tests/tool-ocaml/t110-modint-2.ml
+++ b/testsuite/tests/tool-ocaml/t110-modint-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-mulint.ml b/testsuite/tests/tool-ocaml/t110-mulint.ml
index d8544c8368..bae1ffb610 100644
--- a/testsuite/tests/tool-ocaml/t110-mulint.ml
+++ b/testsuite/tests/tool-ocaml/t110-mulint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-negint.ml b/testsuite/tests/tool-ocaml/t110-negint.ml
index 7bff31d49b..770a2ee81f 100644
--- a/testsuite/tests/tool-ocaml/t110-negint.ml
+++ b/testsuite/tests/tool-ocaml/t110-negint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-offsetint.ml b/testsuite/tests/tool-ocaml/t110-offsetint.ml
index a7ed39703d..9b74667e4f 100644
--- a/testsuite/tests/tool-ocaml/t110-offsetint.ml
+++ b/testsuite/tests/tool-ocaml/t110-offsetint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-orint.ml b/testsuite/tests/tool-ocaml/t110-orint.ml
index 3b77520b20..8551be84b6 100644
--- a/testsuite/tests/tool-ocaml/t110-orint.ml
+++ b/testsuite/tests/tool-ocaml/t110-orint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-subint.ml b/testsuite/tests/tool-ocaml/t110-subint.ml
index 72ee30f6bd..3993dd329e 100644
--- a/testsuite/tests/tool-ocaml/t110-subint.ml
+++ b/testsuite/tests/tool-ocaml/t110-subint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t110-xorint.ml b/testsuite/tests/tool-ocaml/t110-xorint.ml
index d5d3cb5b84..2dd2a9b96c 100644
--- a/testsuite/tests/tool-ocaml/t110-xorint.ml
+++ b/testsuite/tests/tool-ocaml/t110-xorint.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t120-getstringchar.ml b/testsuite/tests/tool-ocaml/t120-getstringchar.ml
index 4988752de0..271022c355 100644
--- a/testsuite/tests/tool-ocaml/t120-getstringchar.ml
+++ b/testsuite/tests/tool-ocaml/t120-getstringchar.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t121-setstringchar.ml b/testsuite/tests/tool-ocaml/t121-setstringchar.ml
index f306c75544..e8704ce016 100644
--- a/testsuite/tests/tool-ocaml/t121-setstringchar.ml
+++ b/testsuite/tests/tool-ocaml/t121-setstringchar.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t130-getvectitem.ml b/testsuite/tests/tool-ocaml/t130-getvectitem.ml
index 6cd284133a..f8af8f1714 100644
--- a/testsuite/tests/tool-ocaml/t130-getvectitem.ml
+++ b/testsuite/tests/tool-ocaml/t130-getvectitem.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t130-vectlength.ml b/testsuite/tests/tool-ocaml/t130-vectlength.ml
index 7e14f3d55d..ea56854426 100644
--- a/testsuite/tests/tool-ocaml/t130-vectlength.ml
+++ b/testsuite/tests/tool-ocaml/t130-vectlength.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t131-setvectitem.ml b/testsuite/tests/tool-ocaml/t131-setvectitem.ml
index b78f51d29a..abb238f3c4 100644
--- a/testsuite/tests/tool-ocaml/t131-setvectitem.ml
+++ b/testsuite/tests/tool-ocaml/t131-setvectitem.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t140-switch-1.ml b/testsuite/tests/tool-ocaml/t140-switch-1.ml
index 54b3dd7fb2..0928b06875 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-1.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t140-switch-2.ml b/testsuite/tests/tool-ocaml/t140-switch-2.ml
index 88026c12a0..3089ffbc0d 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-2.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t140-switch-3.ml b/testsuite/tests/tool-ocaml/t140-switch-3.ml
index f9b9cd706e..ff15ead8a0 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-3.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t140-switch-4.ml b/testsuite/tests/tool-ocaml/t140-switch-4.ml
index 874a244251..61b7954dd0 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-4.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t141-switch-5.ml b/testsuite/tests/tool-ocaml/t141-switch-5.ml
index 454e2b2ec3..29d2cd5d91 100644
--- a/testsuite/tests/tool-ocaml/t141-switch-5.ml
+++ b/testsuite/tests/tool-ocaml/t141-switch-5.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t141-switch-6.ml b/testsuite/tests/tool-ocaml/t141-switch-6.ml
index 6bbd6af6b2..34a87740b3 100644
--- a/testsuite/tests/tool-ocaml/t141-switch-6.ml
+++ b/testsuite/tests/tool-ocaml/t141-switch-6.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t141-switch-7.ml b/testsuite/tests/tool-ocaml/t141-switch-7.ml
index 19425f977c..137080e0c0 100644
--- a/testsuite/tests/tool-ocaml/t141-switch-7.ml
+++ b/testsuite/tests/tool-ocaml/t141-switch-7.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t142-switch-8.ml b/testsuite/tests/tool-ocaml/t142-switch-8.ml
index 0de6b8eb1e..5d806419cc 100644
--- a/testsuite/tests/tool-ocaml/t142-switch-8.ml
+++ b/testsuite/tests/tool-ocaml/t142-switch-8.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t142-switch-9.ml b/testsuite/tests/tool-ocaml/t142-switch-9.ml
index 4cdfc1f88b..8de4de43d2 100644
--- a/testsuite/tests/tool-ocaml/t142-switch-9.ml
+++ b/testsuite/tests/tool-ocaml/t142-switch-9.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t142-switch-A.ml b/testsuite/tests/tool-ocaml/t142-switch-A.ml
index 0d48e3b5ff..09bfdedfbf 100644
--- a/testsuite/tests/tool-ocaml/t142-switch-A.ml
+++ b/testsuite/tests/tool-ocaml/t142-switch-A.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t150-push-1.ml b/testsuite/tests/tool-ocaml/t150-push-1.ml
index 8131d4ebe1..d13723b409 100644
--- a/testsuite/tests/tool-ocaml/t150-push-1.ml
+++ b/testsuite/tests/tool-ocaml/t150-push-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t150-push-2.ml b/testsuite/tests/tool-ocaml/t150-push-2.ml
index 49081e6f2d..ce9cc2877b 100644
--- a/testsuite/tests/tool-ocaml/t150-push-2.ml
+++ b/testsuite/tests/tool-ocaml/t150-push-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t160-closure.ml b/testsuite/tests/tool-ocaml/t160-closure.ml
index ea1599b339..f26a4c9f79 100644
--- a/testsuite/tests/tool-ocaml/t160-closure.ml
+++ b/testsuite/tests/tool-ocaml/t160-closure.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t161-apply1.ml b/testsuite/tests/tool-ocaml/t161-apply1.ml
index e11cba6725..beccf312fc 100644
--- a/testsuite/tests/tool-ocaml/t161-apply1.ml
+++ b/testsuite/tests/tool-ocaml/t161-apply1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t162-return.ml b/testsuite/tests/tool-ocaml/t162-return.ml
index 63c4969783..664c54b21c 100644
--- a/testsuite/tests/tool-ocaml/t162-return.ml
+++ b/testsuite/tests/tool-ocaml/t162-return.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t163.ml b/testsuite/tests/tool-ocaml/t163.ml
index 266823a39e..41380ca26b 100644
--- a/testsuite/tests/tool-ocaml/t163.ml
+++ b/testsuite/tests/tool-ocaml/t163.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t164-apply2.ml b/testsuite/tests/tool-ocaml/t164-apply2.ml
index 79ef41361e..af928e714d 100644
--- a/testsuite/tests/tool-ocaml/t164-apply2.ml
+++ b/testsuite/tests/tool-ocaml/t164-apply2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t164-apply3.ml b/testsuite/tests/tool-ocaml/t164-apply3.ml
index 1c4f236bce..2c4f1f6e5e 100644
--- a/testsuite/tests/tool-ocaml/t164-apply3.ml
+++ b/testsuite/tests/tool-ocaml/t164-apply3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t165-apply.ml b/testsuite/tests/tool-ocaml/t165-apply.ml
index f71e769c02..c06caf0f9b 100644
--- a/testsuite/tests/tool-ocaml/t165-apply.ml
+++ b/testsuite/tests/tool-ocaml/t165-apply.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t170-envacc2.ml b/testsuite/tests/tool-ocaml/t170-envacc2.ml
index c09a08cee3..3484ca54fd 100644
--- a/testsuite/tests/tool-ocaml/t170-envacc2.ml
+++ b/testsuite/tests/tool-ocaml/t170-envacc2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t170-envacc3.ml b/testsuite/tests/tool-ocaml/t170-envacc3.ml
index d70a91246b..583fd00fdb 100644
--- a/testsuite/tests/tool-ocaml/t170-envacc3.ml
+++ b/testsuite/tests/tool-ocaml/t170-envacc3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t170-envacc4.ml b/testsuite/tests/tool-ocaml/t170-envacc4.ml
index 73a95a52b7..70df1ac98f 100644
--- a/testsuite/tests/tool-ocaml/t170-envacc4.ml
+++ b/testsuite/tests/tool-ocaml/t170-envacc4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t171-envacc.ml b/testsuite/tests/tool-ocaml/t171-envacc.ml
index f39b5b85a2..98bb61f5d1 100644
--- a/testsuite/tests/tool-ocaml/t171-envacc.ml
+++ b/testsuite/tests/tool-ocaml/t171-envacc.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml
index 1465bdb3be..7ad3287eb6 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml
index 72e86be731..70e2311579 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml
index 013b03d8a3..170dc2afbc 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml
index 45ab292525..16967b6f6f 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t173-pushenvacc.ml b/testsuite/tests/tool-ocaml/t173-pushenvacc.ml
index 4c86958714..3a2c19ddb0 100644
--- a/testsuite/tests/tool-ocaml/t173-pushenvacc.ml
+++ b/testsuite/tests/tool-ocaml/t173-pushenvacc.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t180-appterm1.ml b/testsuite/tests/tool-ocaml/t180-appterm1.ml
index 70cac0d918..42e6c32386 100644
--- a/testsuite/tests/tool-ocaml/t180-appterm1.ml
+++ b/testsuite/tests/tool-ocaml/t180-appterm1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t180-appterm2.ml b/testsuite/tests/tool-ocaml/t180-appterm2.ml
index e3b9d62a33..0afccadf1f 100644
--- a/testsuite/tests/tool-ocaml/t180-appterm2.ml
+++ b/testsuite/tests/tool-ocaml/t180-appterm2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t180-appterm3.ml b/testsuite/tests/tool-ocaml/t180-appterm3.ml
index 2e4949bb3d..d0ed1e6743 100644
--- a/testsuite/tests/tool-ocaml/t180-appterm3.ml
+++ b/testsuite/tests/tool-ocaml/t180-appterm3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t181-appterm.ml b/testsuite/tests/tool-ocaml/t181-appterm.ml
index d6d179cabf..4a7778e532 100644
--- a/testsuite/tests/tool-ocaml/t181-appterm.ml
+++ b/testsuite/tests/tool-ocaml/t181-appterm.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml b/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml
index 6263bf3d9e..0d3c6d1374 100644
--- a/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml
+++ b/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml b/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml
index 1a650c540f..869b6de9e8 100644
--- a/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml
+++ b/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml b/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml
index fb53a4c9f3..a966a2f21c 100644
--- a/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml
+++ b/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t191-vectlength.ml b/testsuite/tests/tool-ocaml/t191-vectlength.ml
index b2f5a66b2f..ef7a93f5c2 100644
--- a/testsuite/tests/tool-ocaml/t191-vectlength.ml
+++ b/testsuite/tests/tool-ocaml/t191-vectlength.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml b/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml
index 30f2910663..74e1f7a6ae 100644
--- a/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml
+++ b/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml b/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml
index c32b858b97..fc224244de 100644
--- a/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml
+++ b/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml b/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml
index 6ce6578ecd..708c3bc42c 100644
--- a/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml
+++ b/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml b/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml
index 49390a313a..80d010f6ee 100644
--- a/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml
+++ b/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t200-getfield0.ml b/testsuite/tests/tool-ocaml/t200-getfield0.ml
index 5681ab7d4b..fa768984b7 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield0.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t200-getfield1.ml b/testsuite/tests/tool-ocaml/t200-getfield1.ml
index 8e2f1dfe4b..c394ab2c2f 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield1.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t200-getfield2.ml b/testsuite/tests/tool-ocaml/t200-getfield2.ml
index ebddd527dc..954f86f0d5 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield2.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t200-getfield3.ml b/testsuite/tests/tool-ocaml/t200-getfield3.ml
index 487d8f2f22..3381468e0d 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield3.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t201-getfield.ml b/testsuite/tests/tool-ocaml/t201-getfield.ml
index a0d81c892c..f76fe0057c 100644
--- a/testsuite/tests/tool-ocaml/t201-getfield.ml
+++ b/testsuite/tests/tool-ocaml/t201-getfield.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t210-setfield0.ml b/testsuite/tests/tool-ocaml/t210-setfield0.ml
index 4376f1df74..40803c4f20 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield0.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t210-setfield1.ml b/testsuite/tests/tool-ocaml/t210-setfield1.ml
index c5de35c929..ff65da7a2b 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield1.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t210-setfield2.ml b/testsuite/tests/tool-ocaml/t210-setfield2.ml
index ef8218f950..7a46e87aa6 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield2.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t210-setfield3.ml b/testsuite/tests/tool-ocaml/t210-setfield3.ml
index 531d4e8e68..20394fbbdb 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield3.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t211-setfield.ml b/testsuite/tests/tool-ocaml/t211-setfield.ml
index 4183cd69ac..21730fae0b 100644
--- a/testsuite/tests/tool-ocaml/t211-setfield.ml
+++ b/testsuite/tests/tool-ocaml/t211-setfield.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t220-assign.ml b/testsuite/tests/tool-ocaml/t220-assign.ml
index ef8e5725d3..0044f89e30 100644
--- a/testsuite/tests/tool-ocaml/t220-assign.ml
+++ b/testsuite/tests/tool-ocaml/t220-assign.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t230-check_signals.ml b/testsuite/tests/tool-ocaml/t230-check_signals.ml
index 924a649bfb..d027d690be 100644
--- a/testsuite/tests/tool-ocaml/t230-check_signals.ml
+++ b/testsuite/tests/tool-ocaml/t230-check_signals.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t240-c_call1.ml b/testsuite/tests/tool-ocaml/t240-c_call1.ml
index b1be841f09..89758f5014 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call1.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t240-c_call2.ml b/testsuite/tests/tool-ocaml/t240-c_call2.ml
index d4a10a70a5..6a0c055858 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call2.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t240-c_call3.ml b/testsuite/tests/tool-ocaml/t240-c_call3.ml
index 5306aa2205..f98ed86f2e 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call3.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t240-c_call4.ml b/testsuite/tests/tool-ocaml/t240-c_call4.ml
index ba3a2ce7dd..e5a47342a2 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call4.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t240-c_call5.ml b/testsuite/tests/tool-ocaml/t240-c_call5.ml
index 8be199c716..14a5954a9f 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call5.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call5.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t250-closurerec-1.ml b/testsuite/tests/tool-ocaml/t250-closurerec-1.ml
index a8f02b3482..d8e3169f6d 100644
--- a/testsuite/tests/tool-ocaml/t250-closurerec-1.ml
+++ b/testsuite/tests/tool-ocaml/t250-closurerec-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t250-closurerec-2.ml b/testsuite/tests/tool-ocaml/t250-closurerec-2.ml
index 4d973b3692..4ddfd208eb 100644
--- a/testsuite/tests/tool-ocaml/t250-closurerec-2.ml
+++ b/testsuite/tests/tool-ocaml/t250-closurerec-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml
index 6a2fe2c2bc..aa29928be4 100644
--- a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml
+++ b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml
index 10a16d712d..c84eea3774 100644
--- a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml
+++ b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml b/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml
index b0cd3227b9..bc19d6fb45 100644
--- a/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml
+++ b/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml b/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml
index d4d01bdc79..dee93f84dc 100644
--- a/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml
+++ b/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml b/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml
index 0f56a0a2c8..092f755a75 100644
--- a/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml
+++ b/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml b/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml
index e383b8ccbd..977574ded2 100644
--- a/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml
+++ b/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml b/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml
index d131d892a2..69b2f13915 100644
--- a/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml
+++ b/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t254-offsetclosure.ml b/testsuite/tests/tool-ocaml/t254-offsetclosure.ml
index de58828caf..1bf10ceef5 100644
--- a/testsuite/tests/tool-ocaml/t254-offsetclosure.ml
+++ b/testsuite/tests/tool-ocaml/t254-offsetclosure.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t260-offsetref.ml b/testsuite/tests/tool-ocaml/t260-offsetref.ml
index 9803cbe9f6..2884f468b9 100644
--- a/testsuite/tests/tool-ocaml/t260-offsetref.ml
+++ b/testsuite/tests/tool-ocaml/t260-offsetref.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t270-push_retaddr.ml b/testsuite/tests/tool-ocaml/t270-push_retaddr.ml
index 1bfffbc592..137d668c32 100644
--- a/testsuite/tests/tool-ocaml/t270-push_retaddr.ml
+++ b/testsuite/tests/tool-ocaml/t270-push_retaddr.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t300-getmethod.ml b/testsuite/tests/tool-ocaml/t300-getmethod.ml
index 13dae267ce..c860060479 100644
--- a/testsuite/tests/tool-ocaml/t300-getmethod.ml
+++ b/testsuite/tests/tool-ocaml/t300-getmethod.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t301-object.ml b/testsuite/tests/tool-ocaml/t301-object.ml
index 8b82243925..1d035a4a0b 100644
--- a/testsuite/tests/tool-ocaml/t301-object.ml
+++ b/testsuite/tests/tool-ocaml/t301-object.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t310-alloc-1.ml b/testsuite/tests/tool-ocaml/t310-alloc-1.ml
index 4a3b00926b..7021eda5a2 100644
--- a/testsuite/tests/tool-ocaml/t310-alloc-1.ml
+++ b/testsuite/tests/tool-ocaml/t310-alloc-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t310-alloc-2.ml b/testsuite/tests/tool-ocaml/t310-alloc-2.ml
index 10a8d75316..4118a737bd 100644
--- a/testsuite/tests/tool-ocaml/t310-alloc-2.ml
+++ b/testsuite/tests/tool-ocaml/t310-alloc-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t320-gc-1.ml b/testsuite/tests/tool-ocaml/t320-gc-1.ml
index 98986b2f1a..be95ac9e17 100644
--- a/testsuite/tests/tool-ocaml/t320-gc-1.ml
+++ b/testsuite/tests/tool-ocaml/t320-gc-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t320-gc-2.ml b/testsuite/tests/tool-ocaml/t320-gc-2.ml
index cc04f0bb4f..54203e9e72 100644
--- a/testsuite/tests/tool-ocaml/t320-gc-2.ml
+++ b/testsuite/tests/tool-ocaml/t320-gc-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t320-gc-3.ml b/testsuite/tests/tool-ocaml/t320-gc-3.ml
index bf59bf4057..c9b4e49b3e 100644
--- a/testsuite/tests/tool-ocaml/t320-gc-3.ml
+++ b/testsuite/tests/tool-ocaml/t320-gc-3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t330-compact-1.ml b/testsuite/tests/tool-ocaml/t330-compact-1.ml
index b19fd3a5de..fb58c1f859 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-1.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t330-compact-2.ml b/testsuite/tests/tool-ocaml/t330-compact-2.ml
index 3640d8ad07..c61ec42bf3 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-2.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t330-compact-3.ml b/testsuite/tests/tool-ocaml/t330-compact-3.ml
index 17cf1fdcfe..490b686ce6 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-3.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-3.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t330-compact-4.ml b/testsuite/tests/tool-ocaml/t330-compact-4.ml
index a3cc208056..e27be14bb1 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-4.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-4.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t340-weak.ml b/testsuite/tests/tool-ocaml/t340-weak.ml
index 7478483feb..6c3d26e2f3 100644
--- a/testsuite/tests/tool-ocaml/t340-weak.ml
+++ b/testsuite/tests/tool-ocaml/t340-weak.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t350-heapcheck.ml b/testsuite/tests/tool-ocaml/t350-heapcheck.ml
index 6eca59a51c..bf3d137aaa 100644
--- a/testsuite/tests/tool-ocaml/t350-heapcheck.ml
+++ b/testsuite/tests/tool-ocaml/t350-heapcheck.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t360-stacks-1.ml b/testsuite/tests/tool-ocaml/t360-stacks-1.ml
index 965f4992c2..b952c18a8f 100644
--- a/testsuite/tests/tool-ocaml/t360-stacks-1.ml
+++ b/testsuite/tests/tool-ocaml/t360-stacks-1.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocaml/t360-stacks-2.ml b/testsuite/tests/tool-ocaml/t360-stacks-2.ml
index 016cc0db52..d9f6edf71d 100644
--- a/testsuite/tests/tool-ocaml/t360-stacks-2.ml
+++ b/testsuite/tests/tool-ocaml/t360-stacks-2.ml
@@ -1,6 +1,6 @@
(* TEST
include tool-ocaml-lib
-flags = "-w a"
+flags = "-w -a"
ocaml_script_as_argument = "true"
* setup-ocaml-build-env
** ocaml
diff --git a/testsuite/tests/tool-ocamlc-error-cleanup/test.ml b/testsuite/tests/tool-ocamlc-error-cleanup/test.ml
index b0013bd89d..0624a6a8a9 100644
--- a/testsuite/tests/tool-ocamlc-error-cleanup/test.ml
+++ b/testsuite/tests/tool-ocamlc-error-cleanup/test.ml
@@ -3,7 +3,7 @@
compiler_output = "compiler-output.raw"
** ocamlc.byte
all_modules = "test.ml"
-flags = "-warn-error A"
+flags = "-warn-error +A"
ocamlc_byte_exit_status = "2"
*** script
script = "sh ${test_source_directory}/check-error-cleanup.sh"
@@ -11,6 +11,6 @@ script = "sh ${test_source_directory}/check-error-cleanup.sh"
(* Regression test for MPR#7918 *)
let f () =
- (* -warn-error A will error with unused x below *)
+ (* -warn-error +A will error with unused x below *)
let x = 12 in
1
diff --git a/testsuite/tests/typing-fstclassmod/fstclassmod.ml b/testsuite/tests/typing-fstclassmod/fstclassmod.ml
index 9be5399277..a996ee6015 100644
--- a/testsuite/tests/typing-fstclassmod/fstclassmod.ml
+++ b/testsuite/tests/typing-fstclassmod/fstclassmod.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = "-w A -warn-error A"
+ flags = "-w +A -warn-error +A"
*)
(* Example of algorithm parametrized with modules *)
diff --git a/testsuite/tests/typing-misc-bugs/core_array_reduced_ok.ml b/testsuite/tests/typing-misc-bugs/core_array_reduced_ok.ml
index de5eb1170a..38b630185a 100644
--- a/testsuite/tests/typing-misc-bugs/core_array_reduced_ok.ml
+++ b/testsuite/tests/typing-misc-bugs/core_array_reduced_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-misc-bugs/pr6303_bad.ml b/testsuite/tests/typing-misc-bugs/pr6303_bad.ml
index 0f67b86db1..e2980e0f03 100644
--- a/testsuite/tests/typing-misc-bugs/pr6303_bad.ml
+++ b/testsuite/tests/typing-misc-bugs/pr6303_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-misc-bugs/pr6946_bad.ml b/testsuite/tests/typing-misc-bugs/pr6946_bad.ml
index 59bcda1025..5142becdf9 100644
--- a/testsuite/tests/typing-misc-bugs/pr6946_bad.ml
+++ b/testsuite/tests/typing-misc-bugs/pr6946_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/gatien_baron_20131019_ok.ml b/testsuite/tests/typing-modules-bugs/gatien_baron_20131019_ok.ml
index 1241d53c98..fea9becac8 100644
--- a/testsuite/tests/typing-modules-bugs/gatien_baron_20131019_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/gatien_baron_20131019_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr5164_ok.ml b/testsuite/tests/typing-modules-bugs/pr5164_ok.ml
index 4837aac5f5..9d8e571519 100644
--- a/testsuite/tests/typing-modules-bugs/pr5164_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr5164_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr51_ok.ml b/testsuite/tests/typing-modules-bugs/pr51_ok.ml
index 14c517fb8c..740d9bcca6 100644
--- a/testsuite/tests/typing-modules-bugs/pr51_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr51_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr5663_ok.ml b/testsuite/tests/typing-modules-bugs/pr5663_ok.ml
index 813c7de09e..670869b8a5 100644
--- a/testsuite/tests/typing-modules-bugs/pr5663_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr5663_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr5914_ok.ml b/testsuite/tests/typing-modules-bugs/pr5914_ok.ml
index e5e7e8b9a0..a027c0b090 100644
--- a/testsuite/tests/typing-modules-bugs/pr5914_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr5914_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6240_ok.ml b/testsuite/tests/typing-modules-bugs/pr6240_ok.ml
index fa166aa3ef..ce0ef4de5f 100644
--- a/testsuite/tests/typing-modules-bugs/pr6240_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6240_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6293_bad.ml b/testsuite/tests/typing-modules-bugs/pr6293_bad.ml
index d216e2dbef..db93799513 100644
--- a/testsuite/tests/typing-modules-bugs/pr6293_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6293_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr6427_bad.ml b/testsuite/tests/typing-modules-bugs/pr6427_bad.ml
index d05baaf0f3..426c0369d5 100644
--- a/testsuite/tests/typing-modules-bugs/pr6427_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6427_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr6485_ok.ml b/testsuite/tests/typing-modules-bugs/pr6485_ok.ml
index 641a3552ad..cf9a946933 100644
--- a/testsuite/tests/typing-modules-bugs/pr6485_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6485_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6513_ok.ml b/testsuite/tests/typing-modules-bugs/pr6513_ok.ml
index 5e3a8f06c3..6148732604 100644
--- a/testsuite/tests/typing-modules-bugs/pr6513_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6513_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6572_ok.ml b/testsuite/tests/typing-modules-bugs/pr6572_ok.ml
index 94cd21c533..28f33d3520 100644
--- a/testsuite/tests/typing-modules-bugs/pr6572_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6572_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6651_ok.ml b/testsuite/tests/typing-modules-bugs/pr6651_ok.ml
index c3adc8ca39..db48d15f17 100644
--- a/testsuite/tests/typing-modules-bugs/pr6651_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6651_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6752_bad.ml b/testsuite/tests/typing-modules-bugs/pr6752_bad.ml
index 9ee4b12df6..42d39e6afd 100644
--- a/testsuite/tests/typing-modules-bugs/pr6752_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6752_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr6752_ok.ml b/testsuite/tests/typing-modules-bugs/pr6752_ok.ml
index d3b0fdcd06..2d5ac02ad3 100644
--- a/testsuite/tests/typing-modules-bugs/pr6752_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6752_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6899_first_bad.ml b/testsuite/tests/typing-modules-bugs/pr6899_first_bad.ml
index 82b9ca1259..d7c1f71a33 100644
--- a/testsuite/tests/typing-modules-bugs/pr6899_first_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6899_first_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr6899_ok.ml b/testsuite/tests/typing-modules-bugs/pr6899_ok.ml
index 38d91053e1..95d0860c0b 100644
--- a/testsuite/tests/typing-modules-bugs/pr6899_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6899_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6899_second_bad.ml b/testsuite/tests/typing-modules-bugs/pr6899_second_bad.ml
index 4a5635271c..42d8bdde48 100644
--- a/testsuite/tests/typing-modules-bugs/pr6899_second_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6899_second_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr6944_ok.ml b/testsuite/tests/typing-modules-bugs/pr6944_ok.ml
index 88c325a95b..9ff8d3564e 100644
--- a/testsuite/tests/typing-modules-bugs/pr6944_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6944_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6954_ok.ml b/testsuite/tests/typing-modules-bugs/pr6954_ok.ml
index e72c47e207..2970e4f340 100644
--- a/testsuite/tests/typing-modules-bugs/pr6954_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6954_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6981_ok.ml b/testsuite/tests/typing-modules-bugs/pr6981_ok.ml
index 0cc3926175..449e9dc754 100644
--- a/testsuite/tests/typing-modules-bugs/pr6981_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6981_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6982_ok.ml b/testsuite/tests/typing-modules-bugs/pr6982_ok.ml
index d3181a0afb..47b65abba8 100644
--- a/testsuite/tests/typing-modules-bugs/pr6982_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6982_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6985_ok.ml b/testsuite/tests/typing-modules-bugs/pr6985_ok.ml
index 20ed0a6b61..043502dae9 100644
--- a/testsuite/tests/typing-modules-bugs/pr6985_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6985_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr6992_bad.ml b/testsuite/tests/typing-modules-bugs/pr6992_bad.ml
index 21fea7f76f..18733c706b 100644
--- a/testsuite/tests/typing-modules-bugs/pr6992_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr6992_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr7036_ok.ml b/testsuite/tests/typing-modules-bugs/pr7036_ok.ml
index 011cc1b196..305d2425a7 100644
--- a/testsuite/tests/typing-modules-bugs/pr7036_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7036_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7082_ok.ml b/testsuite/tests/typing-modules-bugs/pr7082_ok.ml
index b73052e34e..849427d44b 100644
--- a/testsuite/tests/typing-modules-bugs/pr7082_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7082_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7112_bad.ml b/testsuite/tests/typing-modules-bugs/pr7112_bad.ml
index e67e0279e2..ffc634901f 100644
--- a/testsuite/tests/typing-modules-bugs/pr7112_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7112_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr7112_ok.ml b/testsuite/tests/typing-modules-bugs/pr7112_ok.ml
index 949d4ab55d..666c604c56 100644
--- a/testsuite/tests/typing-modules-bugs/pr7112_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7112_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7152_ok.ml b/testsuite/tests/typing-modules-bugs/pr7152_ok.ml
index 2e70dabff4..eada285f76 100644
--- a/testsuite/tests/typing-modules-bugs/pr7152_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7152_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7182_ok.ml b/testsuite/tests/typing-modules-bugs/pr7182_ok.ml
index c32d1d1169..801348f9f6 100644
--- a/testsuite/tests/typing-modules-bugs/pr7182_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7182_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7305_principal.ml b/testsuite/tests/typing-modules-bugs/pr7305_principal.ml
index 045ab5aa76..3371e37886 100644
--- a/testsuite/tests/typing-modules-bugs/pr7305_principal.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7305_principal.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -principal -w +18+19 -warn-error A "
+flags = " -principal -w +18+19 -warn-error +A "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7321_ok.ml b/testsuite/tests/typing-modules-bugs/pr7321_ok.ml
index 73f40443ee..9d21784738 100644
--- a/testsuite/tests/typing-modules-bugs/pr7321_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7321_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7414_2_bad.ml b/testsuite/tests/typing-modules-bugs/pr7414_2_bad.ml
index e3cfca5fed..1926ae4425 100644
--- a/testsuite/tests/typing-modules-bugs/pr7414_2_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7414_2_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr7414_bad.ml b/testsuite/tests/typing-modules-bugs/pr7414_bad.ml
index c95e0ac1a0..7bc294599d 100644
--- a/testsuite/tests/typing-modules-bugs/pr7414_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7414_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-modules-bugs/pr7519_ok.ml b/testsuite/tests/typing-modules-bugs/pr7519_ok.ml
index 1db6bc3d7a..c6278ce392 100644
--- a/testsuite/tests/typing-modules-bugs/pr7519_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7519_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7601_ok.ml b/testsuite/tests/typing-modules-bugs/pr7601_ok.ml
index 9b3cf39b93..8000392014 100644
--- a/testsuite/tests/typing-modules-bugs/pr7601_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7601_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr7601a_ok.ml b/testsuite/tests/typing-modules-bugs/pr7601a_ok.ml
index fd046d8aba..ce2b8bb71b 100644
--- a/testsuite/tests/typing-modules-bugs/pr7601a_ok.ml
+++ b/testsuite/tests/typing-modules-bugs/pr7601a_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-modules-bugs/pr9695_bad.ml b/testsuite/tests/typing-modules-bugs/pr9695_bad.ml
index 191248a21c..86ea3f8cdf 100644
--- a/testsuite/tests/typing-modules-bugs/pr9695_bad.ml
+++ b/testsuite/tests/typing-modules-bugs/pr9695_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a -no-alias-deps"
+flags = " -w -a -no-alias-deps"
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-objects-bugs/pr3968_bad.ml b/testsuite/tests/typing-objects-bugs/pr3968_bad.ml
index 6b04eee075..e60b35044f 100644
--- a/testsuite/tests/typing-objects-bugs/pr3968_bad.ml
+++ b/testsuite/tests/typing-objects-bugs/pr3968_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-objects-bugs/pr4018_bad.ml b/testsuite/tests/typing-objects-bugs/pr4018_bad.ml
index 8d23f82d93..a2a7235fef 100644
--- a/testsuite/tests/typing-objects-bugs/pr4018_bad.ml
+++ b/testsuite/tests/typing-objects-bugs/pr4018_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-objects-bugs/pr4435_bad.ml b/testsuite/tests/typing-objects-bugs/pr4435_bad.ml
index f869e7d602..9cbd777ee4 100644
--- a/testsuite/tests/typing-objects-bugs/pr4435_bad.ml
+++ b/testsuite/tests/typing-objects-bugs/pr4435_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-objects-bugs/pr4766_ok.ml b/testsuite/tests/typing-objects-bugs/pr4766_ok.ml
index d8511e56f8..565275a499 100644
--- a/testsuite/tests/typing-objects-bugs/pr4766_ok.ml
+++ b/testsuite/tests/typing-objects-bugs/pr4766_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-objects-bugs/pr4824_ok.ml b/testsuite/tests/typing-objects-bugs/pr4824_ok.ml
index 7b31b5d96b..114a5a7534 100644
--- a/testsuite/tests/typing-objects-bugs/pr4824_ok.ml
+++ b/testsuite/tests/typing-objects-bugs/pr4824_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-objects-bugs/pr4824a_bad.ml b/testsuite/tests/typing-objects-bugs/pr4824a_bad.ml
index 37002d71a5..566cd0c771 100644
--- a/testsuite/tests/typing-objects-bugs/pr4824a_bad.ml
+++ b/testsuite/tests/typing-objects-bugs/pr4824a_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-objects-bugs/pr5156_ok.ml b/testsuite/tests/typing-objects-bugs/pr5156_ok.ml
index 6c52480ca4..e17bf711d2 100644
--- a/testsuite/tests/typing-objects-bugs/pr5156_ok.ml
+++ b/testsuite/tests/typing-objects-bugs/pr5156_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-objects-bugs/pr7284_bad.ml b/testsuite/tests/typing-objects-bugs/pr7284_bad.ml
index 4d236cb5b8..ab7bc55d82 100644
--- a/testsuite/tests/typing-objects-bugs/pr7284_bad.ml
+++ b/testsuite/tests/typing-objects-bugs/pr7284_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-objects-bugs/pr7293_ok.ml b/testsuite/tests/typing-objects-bugs/pr7293_ok.ml
index 88694877da..40ba424e05 100644
--- a/testsuite/tests/typing-objects-bugs/pr7293_ok.ml
+++ b/testsuite/tests/typing-objects-bugs/pr7293_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-objects-bugs/woodyatt_ok.ml b/testsuite/tests/typing-objects-bugs/woodyatt_ok.ml
index d0969457d5..a109ed052c 100644
--- a/testsuite/tests/typing-objects-bugs/woodyatt_ok.ml
+++ b/testsuite/tests/typing-objects-bugs/woodyatt_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml b/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml
index 09282762d1..99011ef781 100644
--- a/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml
+++ b/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-poly-bugs/pr5322_ok.ml b/testsuite/tests/typing-poly-bugs/pr5322_ok.ml
index aeda3322f4..7534c64f3e 100644
--- a/testsuite/tests/typing-poly-bugs/pr5322_ok.ml
+++ b/testsuite/tests/typing-poly-bugs/pr5322_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-poly-bugs/pr5673_ok.ml b/testsuite/tests/typing-poly-bugs/pr5673_ok.ml
index f5a5cec747..f30487b18d 100644
--- a/testsuite/tests/typing-poly-bugs/pr5673_ok.ml
+++ b/testsuite/tests/typing-poly-bugs/pr5673_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-poly-bugs/pr6922_ok.ml b/testsuite/tests/typing-poly-bugs/pr6922_ok.ml
index 0e8b7a4aae..1db9e73bf9 100644
--- a/testsuite/tests/typing-poly-bugs/pr6922_ok.ml
+++ b/testsuite/tests/typing-poly-bugs/pr6922_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-polyvariants-bugs/pr4775_ok.ml b/testsuite/tests/typing-polyvariants-bugs/pr4775_ok.ml
index e471f4ec38..e5d5f5978e 100644
--- a/testsuite/tests/typing-polyvariants-bugs/pr4775_ok.ml
+++ b/testsuite/tests/typing-polyvariants-bugs/pr4775_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-polyvariants-bugs/pr4933_ok.ml b/testsuite/tests/typing-polyvariants-bugs/pr4933_ok.ml
index 353169220f..7a0bffcd54 100644
--- a/testsuite/tests/typing-polyvariants-bugs/pr4933_ok.ml
+++ b/testsuite/tests/typing-polyvariants-bugs/pr4933_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml b/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml
index 8edd6b7f82..355eecd3ab 100644
--- a/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml
+++ b/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml b/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml
index 11a84c597f..fa61001722 100644
--- a/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml
+++ b/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-polyvariants-bugs/pr7199_ok.ml b/testsuite/tests/typing-polyvariants-bugs/pr7199_ok.ml
index 02675e057d..75ef0cce6a 100644
--- a/testsuite/tests/typing-polyvariants-bugs/pr7199_ok.ml
+++ b/testsuite/tests/typing-polyvariants-bugs/pr7199_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-polyvariants-bugs/privrowsabate_ok.ml b/testsuite/tests/typing-polyvariants-bugs/privrowsabate_ok.ml
index 7c7383469a..9274c9d4af 100644
--- a/testsuite/tests/typing-polyvariants-bugs/privrowsabate_ok.ml
+++ b/testsuite/tests/typing-polyvariants-bugs/privrowsabate_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-private-bugs/pr5026_bad.ml b/testsuite/tests/typing-private-bugs/pr5026_bad.ml
index 52c135b3dc..c62a3cb99c 100644
--- a/testsuite/tests/typing-private-bugs/pr5026_bad.ml
+++ b/testsuite/tests/typing-private-bugs/pr5026_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-private-bugs/pr5469_ok.ml b/testsuite/tests/typing-private-bugs/pr5469_ok.ml
index e7311b1a5c..a5f36390a7 100644
--- a/testsuite/tests/typing-private-bugs/pr5469_ok.ml
+++ b/testsuite/tests/typing-private-bugs/pr5469_ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t01bad.ml b/testsuite/tests/typing-recmod/t01bad.ml
index f0ae828a80..5bf6197f37 100644
--- a/testsuite/tests/typing-recmod/t01bad.ml
+++ b/testsuite/tests/typing-recmod/t01bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t02bad.ml b/testsuite/tests/typing-recmod/t02bad.ml
index 9a490d890a..1faba72b87 100644
--- a/testsuite/tests/typing-recmod/t02bad.ml
+++ b/testsuite/tests/typing-recmod/t02bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t03ok.ml b/testsuite/tests/typing-recmod/t03ok.ml
index 948d9bf827..a1c9b32a95 100644
--- a/testsuite/tests/typing-recmod/t03ok.ml
+++ b/testsuite/tests/typing-recmod/t03ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t04bad.ml b/testsuite/tests/typing-recmod/t04bad.ml
index 3de1bb109d..a671b414d4 100644
--- a/testsuite/tests/typing-recmod/t04bad.ml
+++ b/testsuite/tests/typing-recmod/t04bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t05bad.ml b/testsuite/tests/typing-recmod/t05bad.ml
index c413cec2bb..1f1df6c590 100644
--- a/testsuite/tests/typing-recmod/t05bad.ml
+++ b/testsuite/tests/typing-recmod/t05bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t06ok.ml b/testsuite/tests/typing-recmod/t06ok.ml
index 4305f24346..a0cfebdbc2 100644
--- a/testsuite/tests/typing-recmod/t06ok.ml
+++ b/testsuite/tests/typing-recmod/t06ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t07bad.ml b/testsuite/tests/typing-recmod/t07bad.ml
index 1aa75ab7a9..27e8f1859f 100644
--- a/testsuite/tests/typing-recmod/t07bad.ml
+++ b/testsuite/tests/typing-recmod/t07bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t08bad.ml b/testsuite/tests/typing-recmod/t08bad.ml
index 0647311bfe..46d2b727c4 100644
--- a/testsuite/tests/typing-recmod/t08bad.ml
+++ b/testsuite/tests/typing-recmod/t08bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t09bad.ml b/testsuite/tests/typing-recmod/t09bad.ml
index ce281c5f7a..9ac5d3133d 100644
--- a/testsuite/tests/typing-recmod/t09bad.ml
+++ b/testsuite/tests/typing-recmod/t09bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t10ok.ml b/testsuite/tests/typing-recmod/t10ok.ml
index e91fe998fb..626ab888fc 100644
--- a/testsuite/tests/typing-recmod/t10ok.ml
+++ b/testsuite/tests/typing-recmod/t10ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t11bad.ml b/testsuite/tests/typing-recmod/t11bad.ml
index 1c8fbee299..f6f2fed846 100644
--- a/testsuite/tests/typing-recmod/t11bad.ml
+++ b/testsuite/tests/typing-recmod/t11bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t12bad.ml b/testsuite/tests/typing-recmod/t12bad.ml
index a0094bed21..cbc8c5bbaf 100644
--- a/testsuite/tests/typing-recmod/t12bad.ml
+++ b/testsuite/tests/typing-recmod/t12bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t13ok.ml b/testsuite/tests/typing-recmod/t13ok.ml
index 5ba8026eab..ee50f89041 100644
--- a/testsuite/tests/typing-recmod/t13ok.ml
+++ b/testsuite/tests/typing-recmod/t13ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t14bad.ml b/testsuite/tests/typing-recmod/t14bad.ml
index 4ef061678b..4fe91cccc1 100644
--- a/testsuite/tests/typing-recmod/t14bad.ml
+++ b/testsuite/tests/typing-recmod/t14bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t15bad.ml b/testsuite/tests/typing-recmod/t15bad.ml
index 71aa31c146..efb99e681e 100644
--- a/testsuite/tests/typing-recmod/t15bad.ml
+++ b/testsuite/tests/typing-recmod/t15bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-recmod/t16ok.ml b/testsuite/tests/typing-recmod/t16ok.ml
index abd6d6a4cc..1e87f4f82d 100644
--- a/testsuite/tests/typing-recmod/t16ok.ml
+++ b/testsuite/tests/typing-recmod/t16ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t17ok.ml b/testsuite/tests/typing-recmod/t17ok.ml
index b59e80e2ed..2a760d1013 100644
--- a/testsuite/tests/typing-recmod/t17ok.ml
+++ b/testsuite/tests/typing-recmod/t17ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t18ok.ml b/testsuite/tests/typing-recmod/t18ok.ml
index 3523f338c9..e4e3ffa611 100644
--- a/testsuite/tests/typing-recmod/t18ok.ml
+++ b/testsuite/tests/typing-recmod/t18ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t20ok.ml b/testsuite/tests/typing-recmod/t20ok.ml
index 98222594e0..ae0eed3264 100644
--- a/testsuite/tests/typing-recmod/t20ok.ml
+++ b/testsuite/tests/typing-recmod/t20ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t21ok.ml b/testsuite/tests/typing-recmod/t21ok.ml
index 59cdcc9f91..2c97da3fb9 100644
--- a/testsuite/tests/typing-recmod/t21ok.ml
+++ b/testsuite/tests/typing-recmod/t21ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-recmod/t22ok.ml b/testsuite/tests/typing-recmod/t22ok.ml
index 16e9cbcfed..4709f23c9a 100644
--- a/testsuite/tests/typing-recmod/t22ok.ml
+++ b/testsuite/tests/typing-recmod/t22ok.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a "
+flags = " -w -a "
* setup-ocamlc.byte-build-env
** ocamlc.byte
*** check-ocamlc.byte-output
diff --git a/testsuite/tests/typing-rectypes-bugs/pr5343_bad.ml b/testsuite/tests/typing-rectypes-bugs/pr5343_bad.ml
index 588c9479bf..518dafe019 100644
--- a/testsuite/tests/typing-rectypes-bugs/pr5343_bad.ml
+++ b/testsuite/tests/typing-rectypes-bugs/pr5343_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a -rectypes "
+flags = " -w -a -rectypes "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-rectypes-bugs/pr6174_bad.ml b/testsuite/tests/typing-rectypes-bugs/pr6174_bad.ml
index 1c95a47dc0..d5c704416c 100644
--- a/testsuite/tests/typing-rectypes-bugs/pr6174_bad.ml
+++ b/testsuite/tests/typing-rectypes-bugs/pr6174_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a -rectypes "
+flags = " -w -a -rectypes "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-rectypes-bugs/pr6870_bad.ml b/testsuite/tests/typing-rectypes-bugs/pr6870_bad.ml
index 4c771b87b4..186e07088b 100644
--- a/testsuite/tests/typing-rectypes-bugs/pr6870_bad.ml
+++ b/testsuite/tests/typing-rectypes-bugs/pr6870_bad.ml
@@ -1,5 +1,5 @@
(* TEST
-flags = " -w a -rectypes "
+flags = " -w -a -rectypes "
ocamlc_byte_exit_status = "2"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml b/testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml
index ef472aec0d..11a3e022c5 100644
--- a/testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml
+++ b/testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/application.ml b/testsuite/tests/typing-warnings/application.ml
index 0ba9f75f4c..1bb05537fd 100644
--- a/testsuite/tests/typing-warnings/application.ml
+++ b/testsuite/tests/typing-warnings/application.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/coercions.ml b/testsuite/tests/typing-warnings/coercions.ml
index 0900975c36..9e05bd9f6f 100644
--- a/testsuite/tests/typing-warnings/coercions.ml
+++ b/testsuite/tests/typing-warnings/coercions.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/exhaustiveness.ml b/testsuite/tests/typing-warnings/exhaustiveness.ml
index 888034aad7..db48bf9f74 100644
--- a/testsuite/tests/typing-warnings/exhaustiveness.ml
+++ b/testsuite/tests/typing-warnings/exhaustiveness.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/open_warnings.ml b/testsuite/tests/typing-warnings/open_warnings.ml
index 299809516b..9220e69f00 100644
--- a/testsuite/tests/typing-warnings/open_warnings.ml
+++ b/testsuite/tests/typing-warnings/open_warnings.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A-41-42-18"
+ flags = " -w +A-41-42-18"
* expect
*)
module T1 : sig end = struct
diff --git a/testsuite/tests/typing-warnings/pr5892.ml b/testsuite/tests/typing-warnings/pr5892.ml
index 5b318ef40b..e20e1aeb04 100644
--- a/testsuite/tests/typing-warnings/pr5892.ml
+++ b/testsuite/tests/typing-warnings/pr5892.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr6587.ml b/testsuite/tests/typing-warnings/pr6587.ml
index 665f6ed7e3..baa45b692c 100644
--- a/testsuite/tests/typing-warnings/pr6587.ml
+++ b/testsuite/tests/typing-warnings/pr6587.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr6872.ml b/testsuite/tests/typing-warnings/pr6872.ml
index 3ca374336b..6d17966c2a 100644
--- a/testsuite/tests/typing-warnings/pr6872.ml
+++ b/testsuite/tests/typing-warnings/pr6872.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr7085.ml b/testsuite/tests/typing-warnings/pr7085.ml
index 3516ee4daa..ee2e421a43 100644
--- a/testsuite/tests/typing-warnings/pr7085.ml
+++ b/testsuite/tests/typing-warnings/pr7085.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr7115.ml b/testsuite/tests/typing-warnings/pr7115.ml
index 43e06cad52..139e9f362c 100644
--- a/testsuite/tests/typing-warnings/pr7115.ml
+++ b/testsuite/tests/typing-warnings/pr7115.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr7261.ml b/testsuite/tests/typing-warnings/pr7261.ml
index ecbbdda225..65c44ecf17 100644
--- a/testsuite/tests/typing-warnings/pr7261.ml
+++ b/testsuite/tests/typing-warnings/pr7261.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* toplevel
*)
diff --git a/testsuite/tests/typing-warnings/pr7297.ml b/testsuite/tests/typing-warnings/pr7297.ml
index 08a2a4be6d..fba56c934c 100644
--- a/testsuite/tests/typing-warnings/pr7297.ml
+++ b/testsuite/tests/typing-warnings/pr7297.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr7553.ml b/testsuite/tests/typing-warnings/pr7553.ml
index a76f19d4aa..24faa0e8cf 100644
--- a/testsuite/tests/typing-warnings/pr7553.ml
+++ b/testsuite/tests/typing-warnings/pr7553.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/pr9244.ml b/testsuite/tests/typing-warnings/pr9244.ml
index 28bf91ff0c..06dd9e9502 100644
--- a/testsuite/tests/typing-warnings/pr9244.ml
+++ b/testsuite/tests/typing-warnings/pr9244.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A "
+ flags = " -w +A "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/records.ml b/testsuite/tests/typing-warnings/records.ml
index 73938fc70b..857b26654e 100644
--- a/testsuite/tests/typing-warnings/records.ml
+++ b/testsuite/tests/typing-warnings/records.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/unused_functor_parameter.ml b/testsuite/tests/typing-warnings/unused_functor_parameter.ml
index 997fca26ed..30949a0103 100644
--- a/testsuite/tests/typing-warnings/unused_functor_parameter.ml
+++ b/testsuite/tests/typing-warnings/unused_functor_parameter.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A "
+ flags = " -w +A "
* expect
*)
diff --git a/testsuite/tests/typing-warnings/unused_types.ml b/testsuite/tests/typing-warnings/unused_types.ml
index 3522069f12..f22c1a9242 100644
--- a/testsuite/tests/typing-warnings/unused_types.ml
+++ b/testsuite/tests/typing-warnings/unused_types.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = " -w A -strict-sequence "
+ flags = " -w +A -strict-sequence "
* expect
*)
diff --git a/testsuite/tests/warnings/deprecated_module.ml b/testsuite/tests/warnings/deprecated_module.ml
index b6a0121d82..178483d728 100644
--- a/testsuite/tests/warnings/deprecated_module.ml
+++ b/testsuite/tests/warnings/deprecated_module.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* bytecode
diff --git a/testsuite/tests/warnings/deprecated_module_assigment.ml b/testsuite/tests/warnings/deprecated_module_assigment.ml
index 93f0e30580..e1c71e18f2 100644
--- a/testsuite/tests/warnings/deprecated_module_assigment.ml
+++ b/testsuite/tests/warnings/deprecated_module_assigment.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* bytecode
diff --git a/testsuite/tests/warnings/deprecated_module_use.ml b/testsuite/tests/warnings/deprecated_module_use.ml
index adf0147459..56ad393b3a 100644
--- a/testsuite/tests/warnings/deprecated_module_use.ml
+++ b/testsuite/tests/warnings/deprecated_module_use.ml
@@ -4,12 +4,12 @@ modules = "deprecated_module.mli deprecated_module.ml"
* setup-ocamlc.byte-build-env
** ocamlc.byte
-flags = "-w a"
+flags = "-w -a"
module = "deprecated_module.mli"
*** ocamlc.byte
module = "deprecated_module.ml"
**** ocamlc.byte
-flags = "-w A"
+flags = "-w +A"
module = "deprecated_module_use.ml"
***** check-ocamlc.byte-output
diff --git a/testsuite/tests/warnings/w01.ml b/testsuite/tests/warnings/w01.ml
index 91782259e6..2953418a72 100644
--- a/testsuite/tests/warnings/w01.ml
+++ b/testsuite/tests/warnings/w01.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w03.ml b/testsuite/tests/warnings/w03.ml
index b9f70b1df5..8b2f543571 100644
--- a/testsuite/tests/warnings/w03.ml
+++ b/testsuite/tests/warnings/w03.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w04.ml b/testsuite/tests/warnings/w04.ml
index dd0fa00ffe..54b194a3a7 100644
--- a/testsuite/tests/warnings/w04.ml
+++ b/testsuite/tests/warnings/w04.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w04_failure.ml b/testsuite/tests/warnings/w04_failure.ml
index 98a84ff18d..4531447afe 100644
--- a/testsuite/tests/warnings/w04_failure.ml
+++ b/testsuite/tests/warnings/w04_failure.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w06.ml b/testsuite/tests/warnings/w06.ml
index e8c64ffb4b..2eefa1b885 100644
--- a/testsuite/tests/warnings/w06.ml
+++ b/testsuite/tests/warnings/w06.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w32.ml b/testsuite/tests/warnings/w32.ml
index cab52568eb..79b4b3093a 100644
--- a/testsuite/tests/warnings/w32.ml
+++ b/testsuite/tests/warnings/w32.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w32b.ml b/testsuite/tests/warnings/w32b.ml
index 7f56659e03..08080cf4f0 100644
--- a/testsuite/tests/warnings/w32b.ml
+++ b/testsuite/tests/warnings/w32b.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w33.ml b/testsuite/tests/warnings/w33.ml
index cff8d9f360..88e0c12a02 100644
--- a/testsuite/tests/warnings/w33.ml
+++ b/testsuite/tests/warnings/w33.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w45.ml b/testsuite/tests/warnings/w45.ml
index 3442c745cf..ee79a759f8 100644
--- a/testsuite/tests/warnings/w45.ml
+++ b/testsuite/tests/warnings/w45.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w47_inline.ml b/testsuite/tests/warnings/w47_inline.ml
index e4b7486011..c0d152caa2 100644
--- a/testsuite/tests/warnings/w47_inline.ml
+++ b/testsuite/tests/warnings/w47_inline.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w50.ml b/testsuite/tests/warnings/w50.ml
index d0ac351c2e..f2ad904cdf 100644
--- a/testsuite/tests/warnings/w50.ml
+++ b/testsuite/tests/warnings/w50.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w51.ml b/testsuite/tests/warnings/w51.ml
index 7f89800c0f..daf0c5fd42 100644
--- a/testsuite/tests/warnings/w51.ml
+++ b/testsuite/tests/warnings/w51.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = "-w A"
+ flags = "-w +A"
* expect
*)
diff --git a/testsuite/tests/warnings/w51_bis.ml b/testsuite/tests/warnings/w51_bis.ml
index 5838255683..07c33e36d4 100644
--- a/testsuite/tests/warnings/w51_bis.ml
+++ b/testsuite/tests/warnings/w51_bis.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w52.ml b/testsuite/tests/warnings/w52.ml
index bf6bd6843d..30a7ade585 100644
--- a/testsuite/tests/warnings/w52.ml
+++ b/testsuite/tests/warnings/w52.ml
@@ -1,5 +1,5 @@
(* TEST
- flags = "-w A"
+ flags = "-w +A"
* expect
*)
diff --git a/testsuite/tests/warnings/w53.ml b/testsuite/tests/warnings/w53.ml
index 2de8a05417..b2d0911dc9 100644
--- a/testsuite/tests/warnings/w53.ml
+++ b/testsuite/tests/warnings/w53.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A-60"
+flags = "-w +A-60"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w54.ml b/testsuite/tests/warnings/w54.ml
index 95bd04bd9f..620c6b5675 100644
--- a/testsuite/tests/warnings/w54.ml
+++ b/testsuite/tests/warnings/w54.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w55.ml b/testsuite/tests/warnings/w55.ml
index 67fecee7ae..ffb74a4c44 100644
--- a/testsuite/tests/warnings/w55.ml
+++ b/testsuite/tests/warnings/w55.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
compile_only = "true"
* setup-ocamlc.byte-build-env
diff --git a/testsuite/tests/warnings/w58.ml b/testsuite/tests/warnings/w58.ml
index 4e59ca5cf9..5857a5be94 100644
--- a/testsuite/tests/warnings/w58.ml
+++ b/testsuite/tests/warnings/w58.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
files = "module_without_cmx.mli"
* setup-ocamlc.byte-build-env
diff --git a/testsuite/tests/warnings/w59.ml b/testsuite/tests/warnings/w59.ml
index 119e363874..fcaa802d42 100644
--- a/testsuite/tests/warnings/w59.ml
+++ b/testsuite/tests/warnings/w59.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
compile_only = "true"
* setup-ocamlc.byte-build-env
diff --git a/testsuite/tests/warnings/w60.ml b/testsuite/tests/warnings/w60.ml
index 2e59615cca..aeab53db9d 100644
--- a/testsuite/tests/warnings/w60.ml
+++ b/testsuite/tests/warnings/w60.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A-67"
+flags = "-w +A-67"
* setup-ocamlc.byte-build-env
** ocamlc.byte
diff --git a/testsuite/tests/warnings/w68.ml b/testsuite/tests/warnings/w68.ml
index 01b9c203ff..c05ccdcc78 100644
--- a/testsuite/tests/warnings/w68.ml
+++ b/testsuite/tests/warnings/w68.ml
@@ -1,6 +1,6 @@
(* TEST
-flags = "-w A"
+flags = "-w +A"
* setup-ocamlopt.byte-build-env
** ocamlopt.byte
diff --git a/testsuite/tests/win-unicode/mltest.ml b/testsuite/tests/win-unicode/mltest.ml
index 802cf5042f..3ea9f0cddf 100644
--- a/testsuite/tests/win-unicode/mltest.ml
+++ b/testsuite/tests/win-unicode/mltest.ml
@@ -1,6 +1,6 @@
(* TEST
include unix
-flags += "-strict-sequence -safe-string -w A -warn-error A"
+flags += "-strict-sequence -safe-string -w +A -warn-error +A"
* windows-unicode
** toplevel
*)
diff --git a/tools/Makefile b/tools/Makefile
index 43564510a7..43d744a0a2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -76,7 +76,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,utils parsing typing bytecomp \
middle_end middle_end/closure middle_end/flambda \
middle_end/flambda/base_types driver toplevel \
file_formats lambda)
-COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A \
+COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error +A \
-principal -safe-string -strict-formats -bin-annot $(INCLUDES)
LINKFLAGS = $(INCLUDES)
VPATH := $(filter-out -I,$(INCLUDES))