Skip to content
Snippets Groups Projects
Commit c83e7905 authored by Florian Lugou's avatar Florian Lugou
Browse files

fixed make test

parent 85b89a90
No related branches found
No related tags found
No related merge requests found
......@@ -443,14 +443,17 @@ updatesimulator:
cd /homes/apvrille/TechTTool/SystemCCode/generated/; make ultraclean
test: $(TEST_MAKEFILES)
$(foreach m,$(TEST_MAKEFILES),$(MAKE) -s -C $(dir $(m)) -f $(TEST_MK);)
test: basic $(TEST_DIRS)
@echo "Everything went fine"
$(TEST_DIR)/%/$(TEST_MK): $(TEST_DIR)/$(TEST_MK)
@cp $< $@
$(TEST_DIRS): %: %/$(TEST_MK) force
$(MAKE) -s -C $@ -f $(TEST_MK)
.PHONY: force
force:;
publishjar: ttooljar
scp bin/ttool.jar apvrille@ssh.enst.fr:public_html/docs/
......@@ -470,6 +473,7 @@ clean:
echo rm -f $$p/*.class;\
rm -f $(TTOOL_SRC)/$$p/*.class $(TTOOL_SRC)/$$p/*.java~; \
done
rm -f $(TEST_DIR)/*.class
@@for t in $(TEST_DIRS); do \
if [ -w $$t/$(TEST_MK) ]; \
then \
......
......@@ -68,7 +68,7 @@ public abstract class AvatarPragma extends AvatarElement {
proofStatus = status;
}
public static LinkedList<AvatarPragma> createFromString(String str, Object obj, LinkedList<AvatarBlock> blocks, HashMap<String, LinkedList<TAttribute>> typeAttributesMap, HashMap<String, String> nameTypeMap, AvatarDesignPanelTranslator.ErrorAccumulator errorAcc){
public static LinkedList<AvatarPragma> createFromString(String str, Object obj, LinkedList<AvatarBlock> blocks, HashMap<String, LinkedList<TAttribute>> typeAttributesMap, HashMap<String, String> nameTypeMap, ErrorAccumulator errorAcc){
//createFromString takes in a pragma string (with # removed), the containing object, and the list of AvatarBlocks, and returns the corresponding AvatarPragma or null if an error occurred
//The attributes referenced must exist
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
* allow the generation of RT-LOTOS or Java code from this diagram,
* and at last to allow the analysis of formal validation traces
* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
* from INRIA Rhone-Alpes.
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*
* /**
* Class ErrorAccumulator
* Creation: 02/08/2016
* @author Florian LUGOU
* @see
*/
package avatartranslator;
public abstract class ErrorAccumulator {
public abstract void addWarning (String msg);
public abstract void addError (String msg);
}
......@@ -127,7 +127,7 @@ public class AvatarDesignPanelTranslator {
return as;
}
public class ErrorAccumulator {
public class ErrorAccumulator extends avatartranslator.ErrorAccumulator {
private TGComponent tgc;
private TDiagramPanel tdp;
private AvatarBlock ab;
......
This diff is collapsed.
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