run-regression-tests:

- Adding the suffix "-u" to a kernel version will make the tests to be run
  with generate-kernel-patch -u ${kernel_version} instead of
  generate-kernel-patch ${kernel_version}.
generate-kernel-patch:
- sBUG(...) and sBUG_ON(...) are now replaced by BUG(...) and BUG_ON(...)
  respectively.
- Option -n does no longer disable the above substitution.
- Source file scst/src/scst_proc.c is now excluded when option -u is specified.
specialize-patch:
- Replaced variable delete_disabled_code by blank_deleted_lines. While setting
  the former variable had the effect of deleting disabled code, the latter
  has the effect of replacing disabled code by blank lines.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1271 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2009-10-25 09:46:40 +00:00
parent 773146af26
commit 0c3c7bc193
3 changed files with 76 additions and 41 deletions
+40 -19
View File
@@ -283,25 +283,34 @@ function process_preprocessor_statement() {
if (output)
any_section_output[if_nesting_level] = 1
}
if (delete_disabled_code \
&& (evaluated ~ "^+#define SCSI_EXEC_REQ_FIFO_DEFINED$" \
&& SCSI_EXEC_REQ_FIFO_DEFINED != "" \
|| evaluated ~ "^+#define SCST_IO_CONTEXT$" \
&& SCST_IO_CONTEXT != "" \
|| (evaluated ~ "^+#define CONFIG_SCST_PROC$" \
&& config_scst_proc_undefined)))
if (evaluated ~ "^+#define SCSI_EXEC_REQ_FIFO_DEFINED$" \
&& SCSI_EXEC_REQ_FIFO_DEFINED != "" \
|| evaluated ~ "^+#define SCST_IO_CONTEXT$" \
&& SCST_IO_CONTEXT != "" \
|| (evaluated ~ "^+#define CONFIG_SCST_PROC$" \
&& config_scst_proc_undefined))
{
lines_deleted += input_line_count
delete_next_blank_line = 1
if (blank_deleted_code)
for (i = 0; i < input_line_count; i++)
line[lines++] = "+"
else
{
lines_deleted += input_line_count
delete_next_blank_line = 1
}
}
else if (delete_disabled_code == 0 || (output && (! condition || condition && matching_if !~ "^+#if [01]")))
else if (output && (! condition || condition && matching_if !~ "^+#if [01]"))
{
for (i = 0; i < input_line_count; i++)
line[lines++] = input_line[i]
}
else
{
lines_deleted += input_line_count
if (blank_deleted_code)
for (i = 0; i < input_line_count; i++)
line[lines++] = "+"
else
lines_deleted += input_line_count
}
}
@@ -349,8 +358,8 @@ BEGIN {
printf "Error: kernel version (%s) is out of range.\n", kernel_version
exit 1
}
if (delete_disabled_code != 0 && delete_disabled_code != 1)
delete_disabled_code = 0
if (blank_deleted_code != 0 && blank_deleted_code != 1)
blank_deleted_code = 0
if (generating_upstream_patch_defined != 0 && generating_upstream_patch_defined != 1)
generating_upstream_patch_defined = 0
if (config_tcp_zero_copy_transfer_completion_notification_undefined != 0 && config_tcp_zero_copy_transfer_completion_notification_undefined != 1)
@@ -385,10 +394,16 @@ BEGIN {
dump_lines()
match($0, "^@@ -([0-9]*),([0-9]*) \\+([0-9]*),([0-9]*) @@(.*)$", h)
}
else if (delete_disabled_code && delete_next_blank_line && match($0, "^+$"))
else if (delete_next_blank_line && match($0, "^+$"))
{
lines_deleted += input_line_count
delete_next_blank_line = 0
if (blank_deleted_code)
for (i = 0; i < input_line_count; i++)
line[lines++] = "+"
else
{
lines_deleted += input_line_count
delete_next_blank_line = 0
}
}
else
{
@@ -397,16 +412,22 @@ BEGIN {
{
process_preprocessor_statement()
}
else if (delete_disabled_code == 0 || output)
else if (output)
{
# Store the lines that were just read.
for (i = 0; i < input_line_count; i++)
line[lines++]=input_line[i]
line[lines++] = input_line[i]
}
else
{
# Discard the last read lines.
lines_deleted += input_line_count
if (blank_deleted_code)
{
for (i = 0; i < input_line_count; i++)
line[lines++] = "+"
}
else
lines_deleted += input_line_count
}
}
}