Commit d29de343 by Jason Merrill

fix so failures are diagnosed

From-SVN: r35881
parent f2a32740
...@@ -25,7 +25,7 @@ int main () ...@@ -25,7 +25,7 @@ int main ()
if (test2 (global_base) == 0) if (test2 (global_base) == 0)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
return 0; return 0;
} }
......
...@@ -10,7 +10,7 @@ int main () ...@@ -10,7 +10,7 @@ int main ()
char *tmp = &buff[0]; // also fails for char *tmp = buff; char *tmp = &buff[0]; // also fails for char *tmp = buff;
if ((__SIZE_TYPE__) tmp != (__SIZE_TYPE__) &buff[0]) if ((__SIZE_TYPE__) tmp != (__SIZE_TYPE__) &buff[0])
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -26,7 +26,7 @@ int test2 (struct base formal_base, int v1) ...@@ -26,7 +26,7 @@ int test2 (struct base formal_base, int v1)
formal_base.f1 = formal_base.f2; // prevent warnings formal_base.f1 = formal_base.f2; // prevent warnings
if (v1 != 0x5e5e) if (v1 != 0x5e5e)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -24,7 +24,7 @@ int main () ...@@ -24,7 +24,7 @@ int main ()
tres_floats tf (v1, v2, v3); tres_floats tf (v1, v2, v3);
if ((tf.get_f1() != v1) || (tf.get_f2() != v2) || (tf.get_f3() != v3)) if ((tf.get_f1() != v1) || (tf.get_f2() != v2) || (tf.get_f3() != v3))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -15,7 +15,7 @@ main () ...@@ -15,7 +15,7 @@ main ()
C c2 (c1); C c2 (c1);
if (count != 1) if (count != 1)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -26,5 +26,5 @@ main() ...@@ -26,5 +26,5 @@ main()
A b(a); A b(a);
printf ("FAIL\n"); printf ("FAIL\n");
return 0; return 1;
} }
...@@ -37,5 +37,8 @@ main () { ...@@ -37,5 +37,8 @@ main () {
if (b.doubleval == 23.2) if (b.doubleval == 23.2)
cout << "PASS\n"; cout << "PASS\n";
else else
cout << "FAIL\n"; {
cout << "FAIL\n";
return 1;
}
} }
...@@ -15,7 +15,7 @@ base global_base(0x55, 0xff); ...@@ -15,7 +15,7 @@ base global_base(0x55, 0xff);
int main () int main ()
{ {
if ((global_base.f1 != 0x55) || (global_base.f2 != 0xff)) if ((global_base.f1 != 0x55) || (global_base.f2 != 0xff))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
......
...@@ -16,7 +16,7 @@ base global_base(0x55, 0x7e); ...@@ -16,7 +16,7 @@ base global_base(0x55, 0x7e);
int main () int main ()
{ {
if ((global_base.f1 != 0x55) || (global_base.f2 != 0x7e)) if ((global_base.f1 != 0x55) || (global_base.f2 != 0x7e))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
......
...@@ -43,7 +43,7 @@ int main () ...@@ -43,7 +43,7 @@ int main ()
{ {
test2 (); test2 ();
if ((base_destructed != 0x781f) || (derived_destructed != 0xf178)) if ((base_destructed != 0x781f) || (derived_destructed != 0xf178))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
......
...@@ -55,7 +55,7 @@ int main () ...@@ -55,7 +55,7 @@ int main ()
test (); test ();
if (errors) if (errors)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -44,7 +44,7 @@ int main () ...@@ -44,7 +44,7 @@ int main ()
delete dp; delete dp;
if ((member_destructor_calls != 8) || (middle_destructor_calls != 2)) if ((member_destructor_calls != 8) || (middle_destructor_calls != 2))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -9,7 +9,7 @@ int main() ...@@ -9,7 +9,7 @@ int main()
*pi = 4; *pi = 4;
if (i != 4) if (i != 4)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -90,7 +90,7 @@ int main() ...@@ -90,7 +90,7 @@ int main()
if (strcmp (output, " 1-a1-11-12-a2-12-1") == 0) if (strcmp (output, " 1-a1-11-12-a2-12-1") == 0)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
return 0; return 0;
} }
...@@ -41,7 +41,7 @@ int main () ...@@ -41,7 +41,7 @@ int main ()
derived_ptr = new derived (); derived_ptr = new derived ();
if ((new_call_count != 2) || (errors != 0)) if ((new_call_count != 2) || (errors != 0))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -32,5 +32,5 @@ int main() ...@@ -32,5 +32,5 @@ int main()
if (pass) if (pass)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -44,7 +44,7 @@ int main () ...@@ -44,7 +44,7 @@ int main ()
k = !k; // fib it! k = !k; // fib it!
if (k.i != 610) if (k.i != 610)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -37,7 +37,7 @@ int main () ...@@ -37,7 +37,7 @@ int main ()
derived_object.method (message); derived_object.method (message);
if (proper_method_called != 1) if (proper_method_called != 1)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -37,5 +37,5 @@ int main() ...@@ -37,5 +37,5 @@ int main()
if (x.first == 10 && x.second == 20 && y == 12.34) if (x.first == 10 && x.second == 20 && y == 12.34)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -47,7 +47,7 @@ void printargs(char** argv) { ...@@ -47,7 +47,7 @@ void printargs(char** argv) {
int PTcl::one(int, char** argv) { int PTcl::one(int, char** argv) {
cout << "FAIL\n"; cout << "FAIL\n";
printargs(argv); printargs(argv);
return 0; return 1;
} }
int PTcl::two(int, char** argv) { int PTcl::two(int, char** argv) {
...@@ -59,11 +59,10 @@ int PTcl::two(int, char** argv) { ...@@ -59,11 +59,10 @@ int PTcl::two(int, char** argv) {
int PTcl::three(int, char** argv) { int PTcl::three(int, char** argv) {
cout << "FAIL\n"; cout << "FAIL\n";
printargs(argv); printargs(argv);
return 0; return 1;
} }
int main (int argc, char** argv) { int main (int argc, char** argv) {
PTcl obj; PTcl obj;
obj.dispatcher(1,argc,argv); return obj.dispatcher(1,argc,argv);
return 0;
} }
...@@ -32,7 +32,7 @@ int main () ...@@ -32,7 +32,7 @@ int main ()
sender_2 (); sender_2 ();
sender_3 (); sender_3 ();
if (ii_sum != 13 || jj_sum != 25) if (ii_sum != 13 || jj_sum != 25)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -35,7 +35,7 @@ int main () ...@@ -35,7 +35,7 @@ int main ()
if (call_count == 1) if (call_count == 1)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
return 0; return 0;
} }
......
...@@ -13,5 +13,5 @@ main () ...@@ -13,5 +13,5 @@ main ()
if (i > 0) if (i > 0)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -10,7 +10,7 @@ extern "C" { ...@@ -10,7 +10,7 @@ extern "C" {
int main() int main()
{ {
if (pow (2.0, 3.0) != 8.0) if (pow (2.0, 3.0) != 8.0)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
// Given the following overloaded function definitions // Given the following overloaded function definitions
void ovf(unsigned long, short, short) { printf ("PASS\n"); } int ovf(unsigned long, short, short) { printf ("PASS\n"); return 0; }
void ovf( int, short, unsigned long) { printf ("FAIL\n"); } int ovf( int, short, unsigned long) { printf ("FAIL\n"); return 1; }
// and the call // and the call
// //
...@@ -28,6 +28,5 @@ int main(int, char**) ...@@ -28,6 +28,5 @@ int main(int, char**)
unsigned int x = 0; unsigned int x = 0;
unsigned int y = 0; unsigned int y = 0;
ovf(pixmap, x, y); return ovf(pixmap, x, y);
return 0;
} }
...@@ -21,7 +21,7 @@ int main(void) ...@@ -21,7 +21,7 @@ int main(void)
S x(int (a)); S x(int (a));
if (count > 0) if (count > 0)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
return 0; return 0;
......
...@@ -19,6 +19,6 @@ int main( void) { ...@@ -19,6 +19,6 @@ int main( void) {
if (&c == &b) if (&c == &b)
printf( "PASS\n"); printf( "PASS\n");
else else
printf( "FAIL\n"); { printf( "FAIL\n"); return 1; }
return 0; return 0;
} }
...@@ -26,16 +26,15 @@ Derived::operator Base&() { ...@@ -26,16 +26,15 @@ Derived::operator Base&() {
return *b; return *b;
} }
void f(Base &b) { int f(Base &b) {
if (b.i == 99) if (b.i == 99)
printf ("PASS\n"); { printf ("PASS\n"); return 0; }
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
int main() { int main() {
Derived d(99); Derived d(99);
f(d); return f(d);
return 0;
} }
...@@ -25,7 +25,7 @@ foo* foo::array = new foo [5]; ...@@ -25,7 +25,7 @@ foo* foo::array = new foo [5];
int main() int main()
{ {
if (i != 5) if (i != 5)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -28,7 +28,7 @@ main(int argc, char **argv) ...@@ -28,7 +28,7 @@ main(int argc, char **argv)
struct foo bar; struct foo bar;
if (offsetof (struct foo, c) > sizeof (unsigned int)) if (offsetof (struct foo, c) > sizeof (unsigned int))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
return 0; return 0;
......
...@@ -14,7 +14,7 @@ int main() ...@@ -14,7 +14,7 @@ int main()
if (i == 2) if (i == 2)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -268,7 +268,7 @@ int main() ...@@ -268,7 +268,7 @@ int main()
int i, j; int i, j;
if (makeforms (cen,a,b) != 10) if (makeforms (cen,a,b) != 10)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
......
...@@ -61,6 +61,6 @@ int main() ...@@ -61,6 +61,6 @@ int main()
if (pass) if (pass)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -14,7 +14,7 @@ public: ...@@ -14,7 +14,7 @@ public:
complex() { re=im=0; magic=MAGIC; } complex() { re=im=0; magic=MAGIC; }
complex(double d) { re=d; im=0; magic=MAGIC; } complex(double d) { re=d; im=0; magic=MAGIC; }
complex(double d, double d2) {re=d; im=d2; magic=MAGIC; } complex(double d, double d2) {re=d; im=d2; magic=MAGIC; }
~complex() {if(magic!=MAGIC) {printf("FAIL\n");exit(0);}} ~complex() {if(magic!=MAGIC) {printf("FAIL\n");exit(1);}}
friend ostream& operator << (ostream& o, const complex& c) friend ostream& operator << (ostream& o, const complex& c)
{ return o << "(" << c.re << "," << c.im << ")"; } { return o << "(" << c.re << "," << c.im << ")"; }
}; };
......
...@@ -43,7 +43,7 @@ int main() { ...@@ -43,7 +43,7 @@ int main() {
D d; D d;
E e; E e;
if (strncmp ("ABCABDABE", stuff, 9)) if (strncmp ("ABCABDABE", stuff, 9))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -63,7 +63,7 @@ int main() { ...@@ -63,7 +63,7 @@ int main() {
|| strcmp (Sig::sigTable[3].Magic, "FLOA") || strcmp (Sig::sigTable[3].Magic, "FLOA")
|| strcmp (Sig::sigTable[4].Magic, "DOUB") || strcmp (Sig::sigTable[4].Magic, "DOUB")
|| strcmp (Sig::sigTable[5].Magic, "COMP")) || strcmp (Sig::sigTable[5].Magic, "COMP"))
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -20,5 +20,5 @@ int main() ...@@ -20,5 +20,5 @@ int main()
&& arr[1].index == -1) && arr[1].index == -1)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -25,5 +25,5 @@ int main() ...@@ -25,5 +25,5 @@ int main()
if (x == 5 && y == 5) if (x == 5 && y == 5)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -27,7 +27,10 @@ A(const char* s) ...@@ -27,7 +27,10 @@ A(const char* s)
// s still ok here // s still ok here
ifstream inf(s); ifstream inf(s);
if (strncmp ("aaa", s, 3)) if (strncmp ("aaa", s, 3))
printf ("FAIL\n"); {
printf ("FAIL\n");
exit (1);
}
else else
printf ("PASS\n"); printf ("PASS\n");
} }
......
...@@ -61,7 +61,7 @@ int main() ...@@ -61,7 +61,7 @@ int main()
printf ("PASS\n"); printf ("PASS\n");
break; break;
default: default:
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
B b(a); B b(a);
......
...@@ -23,7 +23,7 @@ public: ...@@ -23,7 +23,7 @@ public:
if (killed) if (killed)
{ {
printf ("FAIL\n"); printf ("FAIL\n");
exit (0); exit (1);
} }
return *this; return *this;
} }
......
...@@ -29,5 +29,5 @@ int main() { ...@@ -29,5 +29,5 @@ int main() {
if (things == 0) if (things == 0)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
main() main()
{ {
if (sizeof (E) != 4) if (sizeof (E) != 4)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
return 0; return 0;
......
...@@ -14,7 +14,7 @@ int main () ...@@ -14,7 +14,7 @@ int main ()
{ {
S * cls = the_s (); S * cls = the_s ();
if (cls->a != 6) if (cls->a != 6)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -20,5 +20,5 @@ int main() ...@@ -20,5 +20,5 @@ int main()
if (Ack.a == 5 && Ack.b == 7 && Ack.c == 3) if (Ack.a == 5 && Ack.b == 7 && Ack.c == 3)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -20,7 +20,7 @@ int main() ...@@ -20,7 +20,7 @@ int main()
if (Ack.a != 5 if (Ack.a != 5
|| Ack.b != 7 || Ack.b != 7
|| Ack.c != 3) || Ack.c != 3)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -29,7 +29,7 @@ int main() { ...@@ -29,7 +29,7 @@ int main() {
&& ob[3][0].get_a() == 7 && ob[3][1].get_a() == 8) && ob[3][0].get_a() == 7 && ob[3][1].get_a() == 8)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
return 0; return 0;
} }
...@@ -20,7 +20,7 @@ int main(void) ...@@ -20,7 +20,7 @@ int main(void)
::delete ps1; // Wrong T::operator delete() is called here ::delete ps1; // Wrong T::operator delete() is called here
if (delete_counter != -1) if (delete_counter != -1)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
return 0; return 0;
......
...@@ -25,5 +25,5 @@ int main(void) ...@@ -25,5 +25,5 @@ int main(void)
if (pass) if (pass)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -26,7 +26,7 @@ int main(void) ...@@ -26,7 +26,7 @@ int main(void)
{ {
K * pK = new (std::nothrow) K( 10); K * pK = new (std::nothrow) K( 10);
if ( FLAG != 1 ) if ( FLAG != 1 )
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
return 0; return 0;
......
...@@ -21,5 +21,5 @@ int main () ...@@ -21,5 +21,5 @@ int main ()
if (a == 0) if (a == 0)
printf("PASS\n"); printf("PASS\n");
else else
printf("FAIL\n"); { printf("FAIL\n"); return 1; }
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class shape { class shape {
public: public:
virtual void vDisplay(void) const = 0; virtual int vDisplay(void) const = 0;
protected: protected:
int X; int X;
int Y; int Y;
...@@ -16,8 +16,9 @@ class square :public shape { ...@@ -16,8 +16,9 @@ class square :public shape {
Y = y; Y = y;
width = width_; width = width_;
} }
void vDisplay(void) const { int vDisplay(void) const {
printf ("PASS\n"); printf ("PASS\n");
return 0;
} }
protected: protected:
int width; int width;
...@@ -32,8 +33,9 @@ class triangle :public shape { ...@@ -32,8 +33,9 @@ class triangle :public shape {
width = width_; width = width_;
height = height_; height = height_;
} }
void vDisplay(void) const { int vDisplay(void) const {
printf ("FAIL\n"); printf ("FAIL\n");
return 1;
} }
protected: protected:
int width; int width;
...@@ -44,6 +46,6 @@ int main() { ...@@ -44,6 +46,6 @@ int main() {
shape* s1 = new square(4,4,5); shape* s1 = new square(4,4,5);
shape* s2 = new triangle(6,6,2,3); shape* s2 = new triangle(6,6,2,3);
*s1 = *s2; *s1 = *s2;
s1->vDisplay(); return s1->vDisplay();
} }
...@@ -18,7 +18,7 @@ int main() ...@@ -18,7 +18,7 @@ int main()
if (type(0.0) != 2) if (type(0.0) != 2)
++i; ++i;
if (i > 0) if (i > 0)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -38,5 +38,5 @@ int main() { ...@@ -38,5 +38,5 @@ int main() {
if (i == 3) if (i == 3)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -40,5 +40,5 @@ int main () ...@@ -40,5 +40,5 @@ int main ()
if (overloaded_delete == 1) if (overloaded_delete == 1)
printf ("PASS\n"); printf ("PASS\n");
else else
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
} }
...@@ -48,7 +48,7 @@ int main() ...@@ -48,7 +48,7 @@ int main()
// method() returns a reference to the same object. // method() returns a reference to the same object.
f1().method().method(); f1().method().method();
if (fail) if (fail)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -35,7 +35,7 @@ int ...@@ -35,7 +35,7 @@ int
main(void) main(void)
{ {
if (f (2).val != 5) if (f (2).val != 5)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -18,7 +18,7 @@ int main() ...@@ -18,7 +18,7 @@ int main()
{ {
test(&xxx, &str::i) = 5; test(&xxx, &str::i) = 5;
if (xxx.i == 0) if (xxx.i == 0)
printf ("FAIL\n"); { printf ("FAIL\n"); return 1; }
else else
printf ("PASS\n"); printf ("PASS\n");
} }
...@@ -13,7 +13,7 @@ class A ...@@ -13,7 +13,7 @@ class A
class B:public A class B:public A
{ {
public: public:
void SetProp() { if (!aset) { printf ("FAIL\n"); exit (0);} aset--;} void SetProp() { if (!aset) { printf ("FAIL\n"); exit (1);} aset--;}
}; };
int main() int main()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment