fixing up tests

Author: NinaRanns

gcc/c-family/c.opt

@@ -1981,7 +1981,7 @@ EnumValue
 Enum(contract_inheritance) String(P3653) Value(2)
 
 fcontracts-nonattr-inheritance-mode=
-C++ Joined RejectNegative Enum(contract_inheritance) Var(flag_contract_nonattr_inheritance_mode) Init(1)
+C++ Joined RejectNegative Enum(contract_inheritance) Var(flag_contract_nonattr_inheritance_mode) Init(0)
 -fcontracts-nonattr-inheritance-mode=[none|P2900R13|P3653] Select how contracts are inherited for virtual functions
 
 Wsuggest-explicit-contract

gcc/testsuite/g++.dg/contracts/cpp26/virtualSMF-noexcept-pre.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contract_specifier_seq.C

@@ -2,7 +2,7 @@
 // behaves as if the function exited via an exception.
 // This tests the behaviour of a pre condition on a destructor
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe " }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 #include <experimental/contract>
 #include <exception>

gcc/testsuite/g++.dg/contracts/cpp26/contracts-multiple-inheritance2.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-multiple-inheritance2.C

@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 struct BaseA {
   virtual int fun(int n) pre ( n > 0 ) { return -n; }

gcc/testsuite/g++.dg/contracts/cpp26/contracts-pre4.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-pre4.C

@@ -1,6 +1,6 @@
 // test that contracts on overriding functions are found correctly
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 struct Base
 {

gcc/testsuite/g++.dg/contracts/cpp26/contracts-virtual.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-virtual.C

@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr" }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 bool y_f4_called = false;
 bool y2_f4_called = false;

gcc/testsuite/g++.dg/contracts/cpp26/virtual-base.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/virtual-base.C

@@ -1,6 +1,6 @@
 // check that we do not a section type conflict with virtual bases or a duplicate symbol
 // { dg-do run }
-// { dg-options "-fcontracts -std=c++23 -fcontracts-nonattr" }
+// { dg-options "-fcontracts -std=c++23 -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 int x = 9;
 struct Base

gcc/testsuite/g++.dg/contracts/cpp26/virtual-func-nontrivial.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/virtual-func-nontrivial.C

@@ -1,7 +1,7 @@
 // Test that non trivial types work ok with a contract wrapper for virtual
 // functions.
 // { dg-do compile }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -g3" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -g3 -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 struct NonTrivial{
   NonTrivial(){};

gcc/testsuite/g++.dg/contracts/cpp26/virtual_func.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/virtual_func.C

@@ -1,6 +1,6 @@
 // test that contracts on overriding functions are found correctly
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
 #include <cstdio>
 
 struct Base

gcc/testsuite/g++.dg/contracts/cpp26/virtual_func1.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/virtual_func1.C

@@ -1,6 +1,6 @@
 // test that contracts on overriding functions are found correctly
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
 
 #include <cstdio>
 

gcc/testsuite/g++.dg/contracts/cpp26/virtual_func3.C renamed to gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/virtual_func3.C

@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-continuation-mode=on" }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-continuation-mode=on -fcontracts-nonattr-inheritance-mode=P2900R13" }
 template<typename T>
 struct Base
 {