Skip to content

Commit 74e1d6b

Browse files
authored
[Bugfix:Autograding] revise docker images (#50)
Replace some of the docker images used by the examples. (Also replace use of submitty_count with the tree-sitter version submitty_count_ts) note: not tested & debugged yet --------- Co-authored-by: Barb Cutler <Barb Cutler>
1 parent 3d72938 commit 74e1d6b

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

examples/02_simple_cpp/config/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"autograding_method": "docker",
33
"container_options": {
4-
"container_image": "submittyrpi/csci1200:default"
4+
"container_image": "submitty/clang:latest"
55
},
66

77
// For compiled languages, typically two testcases are used to allow points

examples/05_cpp_static_analysis/config/config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
"autograding_method": "docker",
88
"container_options": {
9-
"container_image": "submittyrpi/csci1200:default"
9+
"container_image": "submitty/autograding-default:latest"
1010
},
1111

1212
// Static analysis can also be performed upon C++ code.
@@ -16,8 +16,8 @@
1616
{
1717

1818
"title" : "Check for goto and auto",
19-
"command" : [ "submitty_count token -l c Goto *.cpp",
20-
"submitty_count token -l c Auto *.cpp" ],
19+
"command" : [ "submitty_count_ts -l cpp node auto *.cpp",
20+
"submitty_count_ts -l cpp node auto *.cpp" ],
2121
"points" : 2,
2222
"validation" : [
2323
{

examples/08_memory_debugging/config/config.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"autograding_method": "docker",
33
"container_options": {
4-
"container_image": "submittyrpi/csci1200:default"
4+
"container_image": "submitty/autograding-default:latest"
55
},
66

77
"testcases" : [
@@ -11,17 +11,7 @@
1111
{
1212
"type" : "Compilation",
1313
"title" : "C++ - Compilation (for Dr Memory)",
14-
15-
// ORIGINAL
16-
//"command" : "clang++ -g -Wall -o a.out *.cpp",
17-
18-
// TEMPORARY WORKAROUND
19-
"command" : "clang++ -g -gdwarf-4 -Wall -o a.out *.cpp",
20-
// NOTE: Compiling with the -gdwarf-4 option is required with g++ 11+
21-
// so that DrMemory can print source code line numbers with.
22-
// See also:
23-
// https://github.com/DynamoRIO/drmemory/issues/2485
24-
14+
"command" : "clang++ -g -Wall -o a.out *.cpp",
2515
"executable_name" : "a.out",
2616
"points" : 2
2717
},

0 commit comments

Comments
 (0)