Add socket-related functions and wrappers, and a few other fixes.

.gitignore

@@ -0,0 +1,69 @@
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled headers
+*.gch
+*.pch
+
+# Libraries
+*.a
+*.lib
+*.la
+*.lo
+
+# Shared objects
+*.so
+*.dll
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.com
+*.app
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Vi/Vim
+*.vim
+
+# Emacs
+*~
+\#*\#
+.\#*
+
+# VS Code
+.vscode/
+
+# vi
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# macOS/Windows
+*.DS_Store
+._*
+Thumbs.db
+*.lnk
+
+# Files specific to this project
+student/results.txt
+student/tests
+

.travis.yml

@@ -1,6 +1,18 @@
-language: c
+language: python
+
+python:
+- '3.6'
+
+services:
+- mongodb
+- docker
 
 before_install:
 - sudo apt-get install libcunit1 libcunit1-dev
+- pip3 install git+https://github.com/Maxmawt/INGInious # Until UCL-INGI/INGInious has fixed his part ;-)
+- docker pull ingi/inginious-c-base
+- docker pull ingi/inginious-c-default
+- docker pull ingi/inginious-c-cpp
+- docker pull ingi/inginious-c-pyjavacpp
 
 script: ci/run_ci

ci/courses/LSINF1252

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Assume we're in the correct directory
+
+case $1 in
+	init)
+		echo "Git clone"
+        git clone https://github.com/UCL-INGI/LSINF1252.git
+		;;
+	before_autotest)
+		echo "Before autotest"
+		# Patch the advanced_queue task's run file
+		sed -i '/ret = run/i \ \ \ \ subprocess.run(shlex.split("sed -i '"'"'s|\\$(sort \\$(wildcard \\*\\.c))|$(wildcard *.c)|'"'"' student/Makefile"))' advanced_queue/run && echo -e 'Patched advanced_queue'
+#		cp $2/LSINF1252_advanced_queue_run ./advanced_queue/run
+		# Patch the three tasks with test submissions to remove the
+		# "no-use-fifty" option
+		for i in advanced_queue order_relation_linked_list strcpy;
+		do
+			sed -i 's/--no-use-fifty//' $i/run && echo -e 'Patched' $i
+		done
+		;;
+esac
+
+# That's all
+

ci/run_ci

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-declare -a tests=("test-simple-success" "test-simple-fail")
-cd "$(dirname "$0")"
+_term() {
+    kill -TERM "$child" 2>/dev/null
+}
 
 exec_test() {
     mkdir env/
@@ -11,46 +12,91 @@ exec_test() {
     pushd env
 
     make
-    echo "### $1: executing ..."
-    ./tests
+    echo -e "##### $1: executing ...\n"
+    ./tests &
+    child=$!
+    wait "$child"
 
     if [ -f ./results.txt ]; then
         cmp --silent results.txt expected_results.txt
         if [ $? -eq 0 ]; then
-            echo '###' $1 ': OK'
+            echo -e "\n#####" $1 ": OK"
             pushd
             rm -rf env
             return 1
         else
-            echo '###' $1 ': results.txt diverges from the expected output:'
+            echo -e "\n#####" $1 ": results.txt diverges from the expected output:"
             diff results.txt expected_results.txt
         fi
     else
-        echo '###' $1 ': CTester did not create a results.txt file'
+        echo -e "\n#####" $1 ": CTester did not create a results.txt file"
     fi
 
     popd
     rm -rf env
     return 0
 }
 
+cd "$(dirname "$0")"
+
+trap _term SIGTERM
+
+if [ "$#" -eq "1" ]; then
+    # Execute only the specified test
+    echo -e "##### Executing test" $1
+    exec_test $1
+    if [ $? -eq '1' ]; then
+        echo -e "##### Successful test"
+        exit 0
+    else
+        exit 1
+    fi
+fi
+
+declare -a tests=()
+while IFS= read -r -d $'\0'; do
+    tests+=("$REPLY")
+done < <(find . ! -path "." -type d ! -name "courses" -print0)
 
-echo '### Executing tests'
+if ((${#tests[@]} == 0)); then
+    echo -e "No tests found!" >&2
+    exit 1
+fi
+
+echo -e "Found following tests: " ${tests[@]}
+
+echo -e "##### Executing tests"
 tests_ok=0
 
 for i in "${tests[@]}"
 do
-    echo '##########' $i
+    echo -e "\n####################" $i
     exec_test $i
     if [ $? -eq '1' ]; then
         tests_ok=$((tests_ok+1))
     fi
-
+    echo -e "####################"
 done
 
-echo '###' $tests_ok '/' ${#tests[@]} 'tests succeeded'
+echo -e "\n####################"
+echo -e "### End of tests ###"
+echo -e "####################"
+echo -e "#####" $tests_ok "/" ${#tests[@]} "tests succeeded"
 if ((tests_ok != ${#tests[@]})); then
-    exit 1
+    exitval=1
 else
-    exit 0
+    exitval=0
+fi
+
+
+echo -e "\n####################"
+echo -e "## Testing courses #"
+echo -e "####################"
+
+./run_course
+
+if (($? == 0)); then
+    exit $exitval
+else
+    exit 1
 fi