Changeset 2fbc7a in git

Timestamp:

Sep 9, 2011, 8:11:32 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

1ddcda6fc39f2b06b40627b9f614b701baf17175

Parents:

07f3b73475ddd2e22a747cda080bfb5bc813d7d8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-09 20:11:32+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:42+01:00

Message:

CHG: removed the direc kernel tests (still present in kernel/test.cc)
CHG: more Singular interpretor tests

Location:

Singular

Files:

• makefile (modified) (1 diff)
• test.cc (modified) (7 diffs)

Singular/makefile

@@ -426 +426 @@
         ar cr $@ $^
 
-test: test.o libSingular.a
+# My headers test
+check: testr testg
+        ./testr
+        ./testg
+
+testr: test.o libSingular.a
         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@  -L. -lSingular -L../kernel -lkernel -L../numeric -lnumeric ${LIBPOLYS_LIBS}
-
-# My headers test
-check: test testg
-        ./test
-        ./testg
 
 testg: test.og libSingular_g.a

Singular/test.cc

@@ -249 +249 @@
 {
   // init path names etc.
-  feInitResources(argv[0]); //???
+//  feInitResources(argv[0]); //???
   siInit(argv[0]); // ?
 
-
-  StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
-  feStringAppendResources(0);
-  PrintS(StringAppendS("\n"));
-
-   
-   
   // Libpolys tests:
    
@@ -268 +261 @@
   n[2]=omStrDup("z2");
 
+   
+/*
+  StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
+  feStringAppendResources(0);
+  PrintS(StringAppendS("\n"));
+
+   
+   
   ring R=rDefault(32003,3,n);
   // make R the default ring:
@@ -294 +295 @@
   rChangeCurrRing(NULL);
    
-
+*/
+   
    
    
@@ -303 +305 @@
   // WerrorS_callback=......; of type p(const char *)
   int err=iiEStart(omStrDup("int ver=system(\"version\");export ver;return();\n"),NULL);
-  if (err) errorreported = 0; // reset error handling
+  
   printf("interpreter returns %d\n",err);
+  if (err) 
+     errorreported = 0; // reset error handling
+   
+  assume( err == 0 );
+
   idhdl h=ggetid("ver");
-  if (h!=NULL)
+   
+  if (h != NULL)
     printf("singular variable ver of type %d contains %d\n",h->typ,(int)(long)IDDATA(h));
   else
     printf("variable ver does not exist\n");
-
+   
+  assume( h != NULL );
+
+   
+  err = iiEStart(
+                 omStrDup("system(\"--version\");return();\n"),
+                 NULL);
+   
+  printf("interpreter returns %d\n",err);
+  if (err) 
+     errorreported = 0; // reset error handling   
+   
+  assume( err == 0 );
+   
   // calling a singular-library function
   idhdl datetime=ggetid("datetime");
@@ -324 +345 @@
   // changing a ring for the interpreter
   // re-using n and R from above
-  R=rDefault(32003,3,n);
+  ring R = rDefault(32003, 3, n);
   idhdl newRingHdl=enterid("R" /* ring name*/,
                            0, /*nesting level, 0=global*/
@@ -330 +351 @@
                            &IDROOT,
                            FALSE);
-   IDRING(newRingHdl)=R;
-   // make R the default ring (include rChangeCurrRing):
-   rSetHdl(newRingHdl);
-   err=iiEStart(omStrDup("poly p=x;listvar();return();\n"),NULL);
+  
+  IDRING(newRingHdl)=R;
+  // make R the default ring (include rChangeCurrRing):
+  rSetHdl(newRingHdl);
+  err=iiEStart(omStrDup("poly p=x;listvar();return();\n"),NULL);
 
   // calling a kernel function via the interpreter interface
@@ -341 +363 @@
   arg.data=omStrDup("huhu");
   err=iiExprArith1(&r1,&arg,TYPEOF_CMD);
+  
   printf("interpreter returns %d\n",err);
-  if (err) errorreported = 0; // reset error handling
-  else printf("typeof returned type %d, >>%s<<\n",r1.Typ(),r1.Data());
+  if (err) 
+     errorreported = 0; // reset error handling   
+  else 
+     printf("typeof returned type %d, >>%s<<\n",r1.Typ(),r1.Data());
+   
   // clean up r1:
   r1.CleanUp();