update to 17.02

This commit is contained in:
Johannes Schlatow
2017-03-01 17:21:07 +01:00
parent 31bf253e40
commit 2d18d7a241
5 changed files with 12 additions and 16 deletions

View File

@@ -62,12 +62,11 @@ append config "
<start name=\"test-glucose\"> <start name=\"test-glucose\">
<resource name=\"RAM\" quantum=\"32M\"/> <resource name=\"RAM\" quantum=\"32M\"/>
<config> <config>
<libc stdin=\"/dev/null\" stdout=\"/dev/log\" stderr=\"/dev/log\"> <libc stdin=\"/dev/null\" stdout=\"/dev/log\" stderr=\"/dev/log\" />
<vfs> <vfs>
<dir name=\"dev\"> <log/> <null/> </dir> <dir name=\"dev\"> <log/> <null/> </dir>
<rom name=\"Test.cnf\" size=\"$filesize\"/> <rom name=\"Test.cnf\" size=\"$filesize\"/>
</vfs> </vfs>
</libc>
</config> </config>
</start> </start>
</config>" </config>"

View File

@@ -22,9 +22,8 @@ install_config {
<start name="test-lemon"> <start name="test-lemon">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<config> <config>
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"> <libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs> <vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
</libc>
</config> </config>
</start> </start>
</config> </config>

View File

@@ -25,9 +25,8 @@ install_config {
<config> <config>
<arg value="queens"/> <arg value="queens"/>
<arg value="5"/> <arg value="5"/>
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"> <libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log" />
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs> <vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
</libc>
</config> </config>
</start> </start>
</config> </config>

View File

@@ -22,9 +22,8 @@ install_config {
<start name="test-soplex"> <start name="test-soplex">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<config> <config>
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"> <libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log" />
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs> <vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
</libc>
</config> </config>
</start> </start>
</config> </config>

View File

@@ -1,5 +1,5 @@
TARGET = test-scip TARGET = test-scip
LIBS = posix scip stdcxx config_args LIBS = posix scip stdcxx
SCIP_DIR = $(call select_from_ports,scip)/src/lib/scip/ SCIP_DIR = $(call select_from_ports,scip)/src/lib/scip/
EX_DIR = $(SCIP_DIR)/examples/Queens/src EX_DIR = $(SCIP_DIR)/examples/Queens/src
INC_DIR += $(EX_DIR) INC_DIR += $(EX_DIR)