tput test into subfolder - slidergrid - grid of elastic sliders on a frictional… | |
git clone git://src.adamsgaard.dk/slidergrid | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 8452df073c531a06d60ba75acbc4adde82c63322 | |
parent faa21e62b93f6998ea8a3108b8b58629a8ed8d5d | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 23 Mar 2016 13:04:43 -0700 | |
put test into subfolder | |
Diffstat: | |
M tests/Makefile | 36 ++---------------------------… | |
A tests/elasticity/Makefile | 33 +++++++++++++++++++++++++++++… | |
R tests/twograins.c -> tests/elastic… | 0 | |
3 files changed, 35 insertions(+), 34 deletions(-) | |
--- | |
diff --git a/tests/Makefile b/tests/Makefile | |
t@@ -1,34 +1,2 @@ | |
-CC=gcc | |
-#CFLAGS=-Wall -O3 -march=native | |
-CFLAGS=-Wall -g -pg | |
-LDLIBS=-lm | |
-SRCFOLDER=../slidergrid | |
-ESSENTIALOBJS=$(SRCFOLDER)/main.o \ | |
- $(SRCFOLDER)/slider.o \ | |
- $(SRCFOLDER)/grid.o \ | |
- $(SRCFOLDER)/vector_math.o \ | |
- $(SRCFOLDER)/simulation.o | |
-BIN=test | |
- | |
-default: run-test | |
- | |
-run-test: twograins | |
- ./$< --verbose | |
- @#python postprocessing.py --plot-sliders $<-output | |
- @#rsync -rav test-output /var/www/html/ | |
- | |
-twograins: twograins.o $(ESSENTIALOBJS) | |
- $(CC) $(LDLIBS) $^ -o $@ | |
- | |
-profile: $(BIN) | |
- @gprof $< > $<-profile.txt | |
- @less $<-profile.txt | |
- | |
-debug: $(BIN) | |
- @gdb $< | |
- | |
-clean: | |
- @$(RM) $(BIN) | |
- @$(RM) -r $(BIN)-output | |
- @$(RM) *.o | |
- @$(RM) $(SRCFOLDER)/*.o | |
+all: | |
+ make -C elasticity | |
diff --git a/tests/elasticity/Makefile b/tests/elasticity/Makefile | |
t@@ -0,0 +1,33 @@ | |
+CC=gcc | |
+#CFLAGS=-Wall -O3 -march=native | |
+CFLAGS=-Wall -g -pg | |
+LDLIBS=-lm | |
+SRCFOLDER=../../slidergrid | |
+ESSENTIALOBJS=$(SRCFOLDER)/main.o \ | |
+ $(SRCFOLDER)/slider.o \ | |
+ $(SRCFOLDER)/grid.o \ | |
+ $(SRCFOLDER)/vector_math.o \ | |
+ $(SRCFOLDER)/simulation.o | |
+BIN=twograins | |
+ | |
+default: run-test | |
+ | |
+run-test: normal | |
+ ./$< --verbose | |
+ @#python postprocessing.py --plot-sliders $<-output | |
+ @#rsync -rav test-output /var/www/html/ | |
+ | |
+twograins: twograins.o $(ESSENTIALOBJS) | |
+ $(CC) $(LDLIBS) $^ -o $@ | |
+ | |
+profile: $(BIN) | |
+ @gprof $< > $<-profile.txt | |
+ @less $<-profile.txt | |
+ | |
+debug: $(BIN) | |
+ @gdb $< | |
+ | |
+clean: | |
+ @$(RM) $(BIN) | |
+ @$(RM) -r $(BIN)-output | |
+ @$(RM) *.o | |
diff --git a/tests/twograins.c b/tests/elasticity/normal.c |