improved Makefile, fixed writes: a field width of 0 is not standard

diff --git a/lang/pc/test/Makefile b/lang/pc/test/Makefile
index 84593e8..4a8c905 100644 (file)
--- a/lang/pc/test/Makefile
+++ b/lang/pc/test/Makefile
@@ -1,29 +1,34 @@
 # $Header$
 
-NOFL =
+FLOATS=
+# for machines without floating point:
+FLOATS=-DNOFLOAT
+# for machines with software floating point library:
+FLOATS=-fp
+PC = apc
 
 all:            testC testI
 
 testI:
-               em22 $(NOFL) t1.p; int
-               em22 $(NOFL) t2.p; int
-               em22 $(NOFL) t3.p; int e.out f1 f2 f3 f4 f5 f6
-               em22 $(NOFL) t4.p; int
-               em22 $(NOFL) t5.p; int
-               em22 $(NOFL) tstenc.p; int
-               em22 $(NOFL) tstgto.p; int
-               em22 $(NOFL) -.p callc.p cmod.c ; int
-               rm -f e.out f? *.k
+               em22 $(FLOATS) t1.p; int
+               em22 $(FLOATS) t2.p; int
+               em22 $(FLOATS) t3.p; int e.out f1 f2 f3 f4 f5 f6
+               em22 $(FLOATS) t4.p; int
+               em22 $(FLOATS) t5.p; int
+               em22 $(FLOATS) tstenc.p; int
+               em22 $(FLOATS) tstgto.p; int
+               em22 $(FLOATS) -.p callc.p cmod.c ; int
+               rm -f e.out f? *.k int.log int.mess
 
 testC:
-               apc $(NOFL) t1.p; a.out
-               apc $(NOFL) t2.p; a.out
-               apc $(NOFL) t3.p; a.out f1 f2 f3 f4 f5 f6
-               apc $(NOFL) t4.p; a.out
-               apc $(NOFL) t5.p; a.out
-               apc $(NOFL) tstenc.p; a.out
-               apc $(NOFL) tstgto.p; a.out
-               apc $(NOFL) -.p callc.p cmod.c ; a.out
+               $(PC) $(FLOATS) t1.p ; a.out
+               $(PC) $(FLOATS) t2.p ; a.out
+               $(PC) $(FLOATS) t3.p ; a.out f1 f2 f3 f4 f5 f6
+               $(PC) $(FLOATS) t4.p ; a.out
+               $(PC) $(FLOATS) t5.p ; a.out
+               $(PC) $(FLOATS) tstenc.p ; a.out
+               $(PC) $(FLOATS) tstgto.p ; a.out
+               $(PC) $(FLOATS) callc.p cmod.c ; a.out
                rm -f a.out f? *.[os]
 
 install cmp:

diff --git a/lang/pc/test/t1.p b/lang/pc/test/t1.p
index f9fe87e..65ebf76 100644 (file)
--- a/lang/pc/test/t1.p
+++ b/lang/pc/test/t1.p
@@ -726,5 +726,5 @@ tst17;      tst18;  tst19;  tst20;
 
 #endif
 write('Program t1:',pct:3,' tests completed.');
-writeln('Number of errors = ',ect:0);
+writeln('Number of errors = ',ect:1);
 end.

diff --git a/lang/pc/test/t2.p b/lang/pc/test/t2.p
index f2024b7..9b2c986 100644 (file)
--- a/lang/pc/test/t2.p
+++ b/lang/pc/test/t2.p
@@ -735,5 +735,5 @@ begin ect := 0;  pct := 0;
 tst21; tst22; tst25; tst26; tst27; tst28; tst29; tst30; tst31; tst32; tst33;
 
 write('Program t2:',pct:3,' tests completed.');
-writeln('Number of errors = ',ect:0);
+writeln('Number of errors = ',ect:1);
 end.

diff --git a/lang/pc/test/t3.p b/lang/pc/test/t3.p
index d2fc4fb..1ea9562 100644 (file)
--- a/lang/pc/test/t3.p
+++ b/lang/pc/test/t3.p
@@ -438,5 +438,5 @@ end;
 begin ect:=0; pct:=0;
   tst34;   tst35;   tst36;   tst37;   tst38;
   write('Program t3:',pct:3,' tests completed.');
-  writeln('Number of errors = ',ect:0);
+  writeln('Number of errors = ',ect:1);
 end.

diff --git a/lang/pc/test/t4.p b/lang/pc/test/t4.p
index 3afe646..b8e2eda 100644 (file)
--- a/lang/pc/test/t4.p
+++ b/lang/pc/test/t4.p
@@ -407,5 +407,5 @@ end;
 begin ect:=0; pct:=0;
   tst40; tst41; tst42; tst43; tst44; tst45;
   write('Program t4:',pct:3,' tests completed.');
-  writeln('Number of errors = ',ect:0);
+  writeln('Number of errors = ',ect:1);
 end.