@@ -83,71 +83,9 @@ def test_update_single_package
83
83
# ...and notably no test for adder, which must be disabled from the option override from above
84
84
assert_equal [ 'simple' , 'using-adder' ] , exes
85
85
}
86
- update_with_option_off_and_build_with_uri_shorthand_syntax = -> {
87
- prj . create_lists_from_default_template package : <<~PACK
88
- CPMAddPackage(
89
- URI gh:cpm-cmake/testpack-adder@1.0.0
90
- OPTIONS "ADDER_BUILD_TESTS OFF"
91
- )
92
- PACK
93
- assert_success prj . configure
94
- assert_success prj . build
95
-
96
- exe_dir = File . join ( prj . bin_dir , 'bin' )
97
- assert File . directory? exe_dir
98
-
99
- exes = Dir [ exe_dir + '/**/*' ] . filter {
100
- # on multi-configuration generators (like Visual Studio) the executables will be in bin/<Config>
101
- # also filter-out other artifacts like .pdb or .dsym
102
- !File . directory? ( _1 ) && File . stat ( _1 ) . executable?
103
- } . map {
104
- # remove .exe extension if any (there will be one on Windows)
105
- File . basename ( _1 , '.exe' )
106
- } . sort
107
-
108
- # we should end up with two executables
109
- # * simple - the simple example from adder
110
- # * using-adder - for this project
111
- # ...and notably no test for adder, which must be disabled from the option override from above
112
- assert_equal [ 'simple' , 'using-adder' ] , exes
113
- }
114
- update_with_option_on_and_build_with_uri_shorthand_syntax_and_exclude_from_override = -> {
115
- prj . create_lists_from_default_template package : <<~PACK
116
- CPMAddPackage(
117
- URI gh:cpm-cmake/testpack-adder@1.0.0
118
- OPTIONS "ADDER_BUILD_TESTS ON"
119
- EXCLUDE_FROM_ALL NO
120
- )
121
- PACK
122
- assert_success prj . configure
123
- assert_success prj . build
124
-
125
- exe_dir = File . join ( prj . bin_dir , 'bin' )
126
- assert File . directory? exe_dir
127
-
128
- exes = Dir [ exe_dir + '/**/*' ] . filter {
129
- # on multi-configuration generators (like Visual Studio) the executables will be in bin/<Config>
130
- # also filter-out other artifacts like .pdb or .dsym
131
- !File . directory? ( _1 ) && File . stat ( _1 ) . executable?
132
- } . map {
133
- # remove .exe extension if any (there will be one on Windows)
134
- File . basename ( _1 , '.exe' )
135
- } . sort
136
-
137
- # we should end up with three executables
138
- # * simple - the simple example from adder
139
- # * test-adding - test for adder
140
- # * using-adder - for this project
141
- # ...in contrast to update_with_option_off_and_build_with_uri_shorthand_syntax with
142
- # expect adder not to be disabled, since we set `EXCLUDE_FROM_ALL NO`.
143
- assert_equal [ 'simple' , 'test-adding' , 'using-adder' ] , exes
144
- }
145
-
146
86
147
87
create_with_commit_sha . ( )
148
88
update_to_version_1 . ( )
149
89
update_with_option_off_and_build . ( )
150
- update_with_option_off_and_build_with_uri_shorthand_syntax . ( )
151
- update_with_option_on_and_build_with_uri_shorthand_syntax_and_exclude_from_override . ( )
152
90
end
153
91
end
0 commit comments