Commit b67775d7 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

testing updates, mxx small fix

parent 92cbc9e0

sources/mxx.f90

+3 −3
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
program mxx



implicit none

!character(len=128) :: mdir = "/data/nse_runtime/mxx.echo.directory"

character(len=128) :: mdir = "/Users/Apple/Desktop/data/nse_runtime/mxx.echo.directory"

character(len=128) :: mdir = "/data/nse_runtime/mxx.echo.directory"

!character(len=128) :: mdir = "/Users/Apple/Desktop/data/nse_runtime/mxx.echo.directory"

!"/Users/monk/ownCloud/super-j-nse/Anpassungen/nse-program/PROGJNSEtoSUPER/nse/Sandbox/nse_data/mxx.echo.directory"

integer, parameter :: mtau = 100

integer, parameter :: llen = 512
@@ -137,7 +137,7 @@ character(len=llen) :: dmatch = " " 
inquire(file=trim(mdir),exist=da)

if(.not. da) then

   write(*,*) "File: ",trim(mdir)," NOT FOUND!"

   mdir = "/Users/monk"//mdir

   mdir = "/Users/monk"//mdir(1:128-len("/Users/monk")) ! (paz) make sure it does not overflow

   write(*,*) ".... try: ",trim(mdir)

endif

tests/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ TESTSRC2=\ 
	testgetopt.f90\

	testnewcom.f90



TESTSCRIPTS=\

	testdrspine.sh



# helper library

TESTLIBSRC=\

	print_helper.f90\
@@ -77,13 +80,14 @@ all: $(TESTLIB) $(TESTEXE) $(TESTPRG) 
$(TESTLIB): $(TESTLIBOBJECTS)

	$(AR) $(ARFLAGS) $(TESTLIB) $(TESTLIBOBJECTS)



run:	$(TESTOBJ) $(TESTOEXE)

run:	$(TESTOBJ) $(TESTOEXE) $(TESTSCRIPTS)

	@for f in $(TESTEXE); do echo "#### RUNNING TEST " $$f; ./$$f ; done

	@for f in $(TESTSCRIPTS); do echo "#### RUNNING TEST " $$f; ./$$f ; done



install:



clean:

	@rm -f *.o *.so *.a *.mod *genmod.f90 *.log *.nml *.dat *~ $(TESTEXE) $(TESTPRG)

	@rm -f *.o *.so *.a *.mod *genmod.f90 *.log *.nml *.dat sqtmap.pdf *~ $(TESTEXE) $(TESTPRG)



# ########################################

%.o: %.f90

tests/testdrspine.sh

+16 −3
Original line number Diff line number Diff line 
#!/bin/sh



./sources/drspine -S -d ./examples -x ./tests/macro_test

#

DIR=`dirname $0`

cd   $DIR



# run "standard" drspine evaluation

../sources/drspine -S -d ../examples -x macro_test

if [ $? -eq 0 ]; then echo "drspine run OK"; fi



# verify

diff -wubq ./last_sqt.dat     macro_test.last_sqt.dat.1_0

if [ $? -eq 0 ]; then echo "last_sqt.dat OK"; fi

diff -wubq ./last_sqt_bin.dat macro_test.last_sqt_bin.dat.1_0

if [ $? -eq 0 ]; then echo "last_sqt_bin.dat OK"; fi



# return to previous directory

cd -

diff -wubq ./last_sqt.dat     ./tests/macro_test.last_sqt.dat.1_0

diff -wubq ./last_sqt_bin.dat ./tests/macro_test.last_sqt_bin.dat.1_0