Changeset 942 for trunk


Ignore:
Timestamp:
Feb 2, 2013 6:40:27 PM (7 years ago)
Author:
pbelotti
Message:

avoid infinite loops in tests through a cd && make instead of cd; make

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/Makefile.am

    r908 r942  
    5757
    5858test: all
    59         cd test; $(MAKE) test
     59        cd test && $(MAKE) test
    6060
    6161unitTest: test
  • trunk/Couenne/Makefile.in

    r921 r942  
    836836
    837837test: all
    838         cd test; $(MAKE) test
     838        cd test && $(MAKE) test
    839839
    840840unitTest: test
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-exprSum.cpp

    r831 r942  
    121121         el != lcoe.end (); ++el) {
    122122
    123       CouNumber coe = el -> second;
    124       int       ind = el -> first -> Index ();
     123      register CouNumber coe = el -> second;
     124      register int       ind = el -> first -> Index ();
    125125
    126126      if      (coe >  0.) {I1 [ipos] = ind; C1 [ipos++] = coe;}
  • trunk/Couenne/src/expression/operators/exprGroup.cpp

    r927 r942  
    3434 
    3535  while (size-- > 0) {
    36     if ((i -> second ==  0.) ||
    37         (i -> second == -0.)) {
     36    if (i -> second ==  0.) { // or equivalently, i -> second == -0.
    3837      lcoeff.erase (i);
    3938      i = lcoeff.begin () + ind;
  • trunk/Makefile.am

    r488 r942  
    2424
    2525test: all
    26         cd Couenne; $(MAKE) test
     26        cd Couenne && $(MAKE) test
    2727
    2828unitTest: test
     
    3838
    3939doxydoc:
    40         cd ${srcdir}; doxygen doxydoc/doxygen.conf
     40        cd ${srcdir} && doxygen doxydoc/doxygen.conf
    4141
    4242.PHONY: test unitTest tests unitTests doxydoc
  • trunk/Makefile.in

    r512 r942  
    676676
    677677test: all
    678         cd Couenne; $(MAKE) test
     678        cd Couenne && $(MAKE) test
    679679
    680680unitTest: test
     
    690690
    691691doxydoc:
    692         cd ${srcdir}; doxygen doxydoc/doxygen.conf
     692        cd ${srcdir} && doxygen doxydoc/doxygen.conf
    693693
    694694.PHONY: test unitTest tests unitTests doxydoc
Note: See TracChangeset for help on using the changeset viewer.