Skip to content
Snippets Groups Projects
Commit c8d5f14d authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Update the nonreg test reference with the new test case (of issue #6)

parent 493bc565
No related branches found
No related tags found
No related merge requests found
Pipeline #9676 passed
...@@ -86,11 +86,15 @@ WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test ...@@ -86,11 +86,15 @@ WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test
HTTPTEST=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test HTTPTEST=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test
OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam | head -1 | sed -e 's/^./\U&/') OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam | grep lustre | sort | tail -1 | sed -e 's/^./\U&/')
OPAM_FILE_TEST=$(shell find $(WWW)/test/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/') OPAM_FILE_TEST=$(shell find $(WWW)/test/opam-repository/packages -name opam | grep lustre | sort | tail -1 | sed -e 's/^./\U&/')
OPAM_DIR=$(shell dirname $(OPAM_FILE)) OPAM_DIR=$(shell dirname $(OPAM_FILE))
OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lustre-v6 OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lustre-v6
xxx:
echo "OPAM_FILE_TEST=$(OPAM_FILE_TEST)"
$(PACKNAME).tgz: $(PACKNAME).tgz:
git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
...@@ -98,7 +102,7 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz ...@@ -98,7 +102,7 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
cp $^ $@ cp $^ $@
$(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz $(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@ cp $^ $@
opam : $(WWW)/pool/$(PACKNAME).tgz opam : $(WWW)/pool/$(PACKNAME).tgz
[ "$(BRANCH)" = "master" ] && test -f committed && ( \ [ "$(BRANCH)" = "master" ] && test -f committed && ( \
...@@ -113,7 +117,7 @@ opam : $(WWW)/pool/$(PACKNAME).tgz ...@@ -113,7 +117,7 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
[ "$(BRANCH)" = "master" ] && cd $(WWWTEST)/opam-repository/packages && \ [ "$(BRANCH)" = "master" ] && cd $(WWWTEST)/opam-repository/packages && \
oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \ oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
cp opam $(OPAM_FILE_TEST) && \ cp ~/lus2lic/opam $(OPAM_FILE_TEST) && \
cd .. ; opam-admin check && opam-admin make -g cd .. ; opam-admin check && opam-admin make -g
......
OASISFormat: 0.4 OASISFormat: 0.4
Name: lustre-v6 Name: lustre-v6
Version: 1.746 Version: 1.749
Synopsis: The Lustre V6 Verimag compiler Synopsis: The Lustre V6 Verimag compiler
Description: This package contains: Description: This package contains:
- lv6: the (current) name of the compiler (and interpreter via -exec) - lv6: the (current) name of the compiler (and interpreter via -exec)
......
No preview for this file type
(** Automatically generated from Makefile *) (** Automatically generated from Makefile *)
let tool = "lv6" let tool = "lv6"
let branch = "master" let branch = "master"
let commit = "746" let commit = "749"
let sha_1 = "b5e55fe04f49eef5a6182a8574c8144a5ee7952a" let sha_1 = "493bc565c67740076667e4be85f84654493f204b"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "erwan.jahier@univ-grenoble-alpes.fr" let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment