Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepend deprecated test file names #604

Merged
merged 2 commits into from
Feb 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/test_deprecated/test_old_io_syntax/build/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
["I1","BitIn"],
["O","Bit"]
]],
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"55"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"55"}
},
"main":{
"type":["Record",[
Expand All @@ -18,33 +18,33 @@
"instances":{
"and2_0":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"61"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"61"}
},
"and2_1":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"61"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"61"}
},
"and2_2":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"61"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"61"}
},
"and2_3":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"61"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"61"}
}
},
"connections":[
["self.I.0","and2_0.I0",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"63"}],
["self.I.1","and2_0.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"64"}],
["and2_1.I0","and2_0.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"66"}],
["self.I.1","and2_1.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"67"}],
["and2_2.I0","and2_1.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"66"}],
["self.I.1","and2_2.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"67"}],
["and2_3.I0","and2_2.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"66"}],
["self.I.1","and2_3.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"67"}],
["self.O","and2_3.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"70"}]
["self.I.0","and2_0.I0",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"63"}],
["self.I.1","and2_0.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"64"}],
["and2_1.I0","and2_0.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"66"}],
["self.I.1","and2_1.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"67"}],
["and2_2.I0","and2_1.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"66"}],
["self.I.1","and2_2.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"67"}],
["and2_3.I0","and2_2.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"66"}],
["self.I.1","and2_3.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"67"}],
["self.O","and2_3.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"70"}]
],
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"57"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"57"}
}
}
}
Expand Down
36 changes: 18 additions & 18 deletions tests/test_deprecated/test_old_io_syntax/gold/test_for_loop_def.v
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
// Defined at tests/test_deprecated/test_old_io_syntax/test_define.py:57
// Defined at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:57
module main (input [1:0] I, output O);
wire and2_0_O;
wire and2_1_O;
wire and2_2_O;
wire and2_3_O;
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:61
// Argument I0(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:63
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:64
// Argument O(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:66
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:61
// Argument I0(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:63
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:64
// Argument O(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:66
And2 and2_0 (.I0(I[0]), .I1(I[1]), .O(and2_0_O));
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:61
// Argument I0(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:66
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:67
// Argument O(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:66
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:61
// Argument I0(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:66
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:67
// Argument O(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:66
And2 and2_1 (.I0(and2_0_O), .I1(I[1]), .O(and2_1_O));
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:61
// Argument I0(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:66
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:67
// Argument O(and2_2_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:66
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:61
// Argument I0(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:66
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:67
// Argument O(and2_2_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:66
And2 and2_2 (.I0(and2_1_O), .I1(I[1]), .O(and2_2_O));
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:61
// Argument I0(and2_2_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:66
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:67
// Argument O(and2_3_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:70
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:61
// Argument I0(and2_2_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:66
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:67
// Argument O(and2_3_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:70
And2 and2_3 (.I0(and2_2_O), .I1(I[1]), .O(and2_3_O));
// Wired at tests/test_deprecated/test_old_io_syntax/test_define.py:70
// Wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:70
assign O = and2_3_O;
endmodule

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
["I1","BitIn"],
["O","Bit"]
]],
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"87"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"87"}
},
"main":{
"type":["Record",[
Expand All @@ -18,27 +18,27 @@
"instances":{
"and2_0":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"91"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"91"}
},
"and2_1":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"92"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"92"}
},
"and2_2":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"98"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"98"}
}
},
"connections":[
["self.I.0","and2_0.I0",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"94"}],
["self.I.1","and2_0.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"95"}],
["and2_1.I0","and2_0.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"96"}],
["self.I.1","and2_1.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"97"}],
["and2_2.I0","and2_1.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"99"}],
["self.I.0","and2_2.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"100"}],
["self.O","and2_2.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"102"}]
["self.I.0","and2_0.I0",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"94"}],
["self.I.1","and2_0.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"95"}],
["and2_1.I0","and2_0.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"96"}],
["self.I.1","and2_1.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"97"}],
["and2_2.I0","and2_1.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"99"}],
["self.I.0","and2_2.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"100"}],
["self.O","and2_2.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"102"}]
],
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"89"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"89"}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// Defined at tests/test_deprecated/test_old_io_syntax/test_define.py:89
// Defined at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:89
module main (input [1:0] I, output O);
wire and2_0_O;
wire and2_1_O;
wire and2_2_O;
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:91
// Argument I0(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:94
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:95
// Argument O(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:96
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:91
// Argument I0(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:94
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:95
// Argument O(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:96
And2 and2_0 (.I0(I[0]), .I1(I[1]), .O(and2_0_O));
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:92
// Argument I0(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:96
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:97
// Argument O(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:99
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:92
// Argument I0(and2_0_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:96
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:97
// Argument O(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:99
And2 and2_1 (.I0(and2_0_O), .I1(I[1]), .O(and2_1_O));
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:98
// Argument I0(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:99
// Argument I1(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:100
// Argument O(and2_2_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:102
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:98
// Argument I0(and2_1_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:99
// Argument I1(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:100
// Argument O(and2_2_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:102
And2 and2_2 (.I0(and2_1_O), .I1(I[0]), .O(and2_2_O));
// Wired at tests/test_deprecated/test_old_io_syntax/test_define.py:102
// Wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:102
assign O = and2_2_O;
endmodule

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
["I1","BitIn"],
["O","Bit"]
]],
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"14"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"14"}
},
"main":{
"type":["Record",[
Expand All @@ -18,15 +18,15 @@
"instances":{
"and2":{
"modref":"global.And2",
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"18"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"18"}
}
},
"connections":[
["self.I.0","and2.I0",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"20"}],
["self.I.1","and2.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"21"}],
["self.O","and2.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"22"}]
["self.I.0","and2.I0",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"20"}],
["self.I.1","and2.I1",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"21"}],
["self.O","and2.O",{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"22"}]
],
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_define.py","lineno":"16"}
"metadata":{"filename":"tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py","lineno":"16"}
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions tests/test_deprecated/test_old_io_syntax/gold/test_simple_def.v
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Defined at tests/test_deprecated/test_old_io_syntax/test_define.py:16
// Defined at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:16
module main (input [1:0] I, output O);
wire and2_O;
// Instanced at tests/test_deprecated/test_old_io_syntax/test_define.py:18
// Argument I0(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:20
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:21
// Argument O(and2_O) wired at tests/test_deprecated/test_old_io_syntax/test_define.py:22
// Instanced at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:18
// Argument I0(I[0]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:20
// Argument I1(I[1]) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:21
// Argument O(and2_O) wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:22
And2 and2 (.I0(I[0]), .I1(I[1]), .O(and2_O));
// Wired at tests/test_deprecated/test_old_io_syntax/test_define.py:22
// Wired at tests/test_deprecated/test_old_io_syntax/test_old_io_syntax_define.py:22
assign O = and2_O;
endmodule

Loading