Skip to content

GitLab

Commit 252aa781 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Merging Pascal and R1 branches (there were some conflicts in mainArg.ml).

parents 38651b5d 4b3e5d78
Hide whitespace changes
Inline Side-by-side
examples/Makefile
View file @ 252aa781
......@@ -43,6 +43,7 @@ test-lutin:
cd lutin/external_code && make test;
cd lutin/luciole && make test ;
cd lutin/lustre && make test ;
cd lutin/test_ok && make test ;
echo "All lutin tests ran correctly."
test: test-lucky test-lutin
......
examples/lutin/test_ok/,dotest 0 → 100755
View file @ 252aa781
#!/bin/bash
LUTIN="$LURETTE_PATH/$HOSTTYPE/bin/lutin -seed 9 -l 100"
TDIR=,test
IDIR=,ins
function getnodes {
cat $1 | grep "^node " | sed -e "s/^node [ ]*\([^ (]*\)[ (].*$/\1/"
}
function dolutin {
local base=$1
local n=$2
local ins="$IDIR/$base-$n.ins"
local rif=$TDIR/$base-$n.rif
if [ ! -f "$ins" ]; then
#ins="/dev/null"
cat /dev/null | $LUTIN "$base.lut" -m $n -l 1 | grep -e "#inputs"
echo "-- please provide a file \"$ins\" (even empty !)"
exit 1
fi
#set -x
echo "cat \"$ins\" | $LUTIN \"$base.lut\" -m $n > \"$rif\""
cat "$ins" | $LUTIN "$base.lut" -m $n > "$rif"
if [ $? != 0 ]; then exit 1; fi
#set +x
}
function testit {
local f="$1"
local n=$2
local base=`basename "$f" .lut`
local rif="$TDIR/$base-$n.rif"
local ref="$rif.ref"
local res="$base-$n.res"
if [ ! -f "$ref" ]; then
echo "-- RUN \"make utest\" first !"
exit 1
fi
dolutin "$base" $n
diff -u -i "$rif" "$ref" > "$res"
if [ $? != 0 ]; then exit 1; fi
local problem=`cat "$res" | wc -c`
if [ $problem != 0 ]; then
exit 1
else
echo rm -f "$res"
rm -f "$res"
fi
}
function utestit {
local f="$1"
local n=$2
local base=`basename "$f" .lut`
dolutin "$base" $n
local rif="$TDIR/$base-$n.rif"
local ref="$rif.ref"
mv -f "$rif" "$ref"
}
if [ "$1" = "-u" ]; then
treat=utestit
else
treat=testit
fi
for f in *.lut; do
for n in `getnodes $f`; do
$treat $f $n
done
done
examples/lutin/test_ok/,ins/expand-n1.ins 0 → 100644
View file @ 252aa781
0 1
0 1
1 0
1 1
0 1
1 0
0 0
1 1
1 1
0 0
0 1
1 1
1 1
1 0
0 0
1 1
0 1
1 0
1 1
0 1
1 0
0 0
1 1
1 1
0 0
0 1
1 1
1 1
1 0
0 0
1 1
1 0
0 1
1 0
0 1
1 1
1 0
0 1
1 0
0 1
1 1
1 0
1 1
0 1
0 1
1 0
1 1
0 1
1 0
0 0
1 1
1 1
0 0
0 1
0 1
1 0
1 1
0 1
1 0
0 0
1 1
1 1
0 0
0 1
1 1
1 1
1 0
0 0
1 1
1 0
0 1
1 0
0 1
1 1
1 1
1 1
1 0
0 0
1 1
1 0
0 1
1 0
0 1
1 1
1 0
0 0
1 1
1 1
0 0
0 1
1 1
1 1
1 0
0 0
1 1
1 0
0 1
1 0
0 1
1 1
1 0
1 0
0 0
1 1
1 1
1 0
0 1
1 0
examples/lutin/test_ok/,ins/expand-n2.ins 0 → 100644
View file @ 252aa781
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
0
1
0
1
1
0
1
1
1
0
1
1
0
0
1
1
0
1
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
1
1
0
0
1
0
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
0
0
0
1
1
0
1
0
examples/lutin/test_ok/,ins/expand-n3.ins 0 → 100644
View file @ 252aa781
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
0
1
0
1
1
0
1
1
1
0
1
1
0
0
1
1
0
1
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
1
1
0
0
1
0
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
0
0
0
1
1
0
1
0
examples/lutin/test_ok/,ins/expand-n4.ins 0 → 100644
View file @ 252aa781
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
0
1
0
1
1
0
1
1
1
0
1
1
0
0
1
1
0
1
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
1
1
0
0
1
0
1
0
1
1
0
0
1
1
0
1
1
1
0
0
1
0
1
0
1
1
0
0
0
1
1
0
1
0
examples/lutin/test_ok/,ins/expand-n6.ins 0 → 100644
View file @ 252aa781
5 4
8 5
2 0
9 6
10 0
10 4
6 5
2 2
4 4
5 8
8 4
4 2
2 10
10 6
5 2
4 3
8 1
9 0
1 9
0 4
10 9
6 5
1 6
3 5
1 5
2 3
1 4
7 0
6 10
4 5
8 7
8 10
1 6
5 1
5 5
4 8
3 4
5 2
4 2
4 5
5 8
2 2
10 0
4 8
10 5
8 9
3 1
9 1
2 10
0 6
5 0
5 1
10 4
9 4
6 7
2 8
0 9
7 10
9 3
0 9
1 6
0 2
8 1
5 1
3 6
9 6
3 9
1 7
2 3
7 4
7 3
3 8
0 7
3 7
2 5
9 8
6 5
1 1
7 2
6 0
3 4
3 7
6 8
5 2
2 0
9 3
10 7
6 10
3 3
2 9
5 8
2 2
6 3
8 9
4 5
5 5
6 1
4 5
7 10
7 5