summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-07-07 21:20:20 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-07-07 21:20:20 (GMT)
commit97136e3cf225c9c7a5e0e6718252cb9b546180d4 (patch)
treea591f65e944b6b99e602022b53a9e8240badd7d2
parent15874284b8d2177b9ff6695d9cc768075842f30d (diff)
Make regtest work back again.
-rw-r--r--samples/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/samples/Makefile b/samples/Makefile
index 2fd93a4..07a7556 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -40,20 +40,20 @@ PHONY += regtest
regtest:
@for samp in $(CT_SAMPLES); do \
echo -e "\rBuilding sample \"$${samp}\"" && \
- $(MAKE) -C $(CT_TOP_DIR) -f $(CT_MAKEFILE) $${samp}_copy_config && \
- yes "" |$(MAKE) -C $(CT_TOP_DIR) -f $(CT_MAKEFILE) defoldconfig >/dev/null 2>&1 && \
+ $(CT_NG) $${samp}_copy_config && \
+ yes "" |$(CT_NG) defoldconfig >/dev/null 2>&1 && \
sed -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$${CT_TOP_DIR}/targets/tst/$${CT_TARGET}":;' .config && \
sed -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config && \
sed -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config && \
sed -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config && \
sed -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config && \
sed -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config && \
- yes "" |$(MAKE) -C $(CT_TOP_DIR) -f $(CT_MAKEFILE) defoldconfig >/dev/null 2>&1 && \
- $(MAKE) -C $(CT_TOP_DIR) -f $(CT_MAKEFILE) && \
+ yes "" |$(CT_NG) defoldconfig >/dev/null 2>&1 && \
+ $(CT_NG) build && \
echo -e "\rMaking tarball for sample \"$${samp}\"" && \
- $(MAKE) -C $(CT_TOP_DIR) -f $(CT_MAKEFILE) tarball ; \
+ $(CT_NG) tarball ; \
echo -e "\rCleaning sample \"$${samp}\"" ; \
- $(MAKE) -C $(CT_TOP_DIR) -f $(CT_MAKEFILE) distclean ; \
+ $(CT_NG) distclean ; \
done
saveconfig: